diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI
index 91d4270d1..eab2c5d47 100644
--- a/gamedir/Data-1.13/Ja2_Options.INI
+++ b/gamedir/Data-1.13/Ja2_Options.INI
@@ -1345,4 +1345,11 @@ SMART_TRAINING-WAKE_HANDLER = 0
 ; trainer awake to work with them. However, they will rest until the trainer awakes, so fatigue isn't lost while they wait.
 ;******************************************************************************************************************************
 
-SMART_TRAINING_REST = 0
\ No newline at end of file
+SMART_TRAINING_REST = 0
+
+;******************************************************************************************************************************
+; This setting controls, if attachments on weapons should be shown in the tooltip when hovering over a weapon
+; in Bobby Rays shop.
+;******************************************************************************************************************************
+
+BOBBY_RAY_TOOLTIPS_SHOW_POSSIBLE_ATTACHMENTS = TRUE
\ No newline at end of file
diff --git a/gamedir/Data/Ja2_Options.INI b/gamedir/Data/Ja2_Options.INI
index 3262bd517..14cdb93f5 100644
--- a/gamedir/Data/Ja2_Options.INI
+++ b/gamedir/Data/Ja2_Options.INI
@@ -1346,4 +1346,11 @@ SMART_TRAINING-WAKE_HANDLER = 0
 ; trainer awake to work with them. However, they will rest until the trainer awakes, so fatigue isn't lost while they wait.
 ;******************************************************************************************************************************
 
-SMART_TRAINING_REST = 0
\ No newline at end of file
+SMART_TRAINING_REST = 0
+
+;******************************************************************************************************************************
+; This setting controls, if attachments on weapons should be shown in the tooltip when hovering over a weapon
+; in Bobby Rays shop.
+;******************************************************************************************************************************
+
+BOBBY_RAY_TOOLTIPS_SHOW_POSSIBLE_ATTACHMENTS = FALSE
\ No newline at end of file