diff --git a/GameSettings.cpp b/GameSettings.cpp
index ca233e441..092ec97d6 100644
--- a/GameSettings.cpp
+++ b/GameSettings.cpp
@@ -1133,6 +1133,9 @@ void LoadGameExternalOptions()
 
 	// HEADROCK HAM B2.8: New Trainer Relations: 2 = Trainers will rest if no trainees available. 3 = Trainees will rest if no trainers available (not recommended). 1 = Both. 0 = Neither.
 	gGameExternalOptions.ubSmartTrainingRest				= iniReader.ReadInteger("JA2 HAM Settings","SMART_TRAINING_REST", 0);
+
+	// WANNE: HEADROCK HAM 3: Bobby Rays attachment tooltips
+	gGameExternalOptions.fBobbyRayTooltipsShowAttachments	= iniReader.ReadBoolean("JA2 HAM Settings","BOBBY_RAY_TOOLTIPS_SHOW_POSSIBLE_ATTACHMENTS", FALSE);
 }
 
 INT16 DynamicAdjustAPConstants(INT16 iniReadValue, INT16 iniDefaultValue, BOOLEAN reverse)
diff --git a/GameSettings.h b/GameSettings.h
index 6a14c74a1..123604c6f 100644
--- a/GameSettings.h
+++ b/GameSettings.h
@@ -637,6 +637,9 @@ BOOLEAN gbBulletTracer;
 	// HEADROCK HAM B2.8: New Trainer Relations: 2 = Trainers will rest if no trainees available. 3 = Trainees will rest if no trainers available (not recommended). 1 = Both. 0 = Neither.
 	UINT8 ubSmartTrainingRest;
 
+	// HEADROCK HAM 3: Show Tooltips from Attachments in Bobby Rays shop=
+	BOOLEAN fBobbyRayTooltipsShowAttachments;
+
 	// The_Bob - real time sneaking code 01/06/09
 	// Suport disabling/silencing real time sneaking via external .ini file
 	BOOLEAN fAllowRealTimeSneak;
diff --git a/Laptop/BobbyRGuns.cpp b/Laptop/BobbyRGuns.cpp
index 9e59e9058..10ce45c19 100644
--- a/Laptop/BobbyRGuns.cpp
+++ b/Laptop/BobbyRGuns.cpp
@@ -2457,7 +2457,7 @@ void CreateMouseRegionForBigImage( UINT16 usPosY, UINT8 ubCount, INT16 *pItemNum
 				swprintf( attachStr3, L"" );
 
 				// HEADROCK HAM 3: Generate list of possible attachments to a gun (Guns only!)
-				//if (gGameExternalOptions.fBobbyRayTooltipsShowAttachments)
+				if (gGameExternalOptions.fBobbyRayTooltipsShowAttachments)
 				{
 					// Check entire attachment list
 					UINT16 iLoop = 0;