diff --git a/Plugin/Plugin.m b/Plugin/Plugin.m
index dc7a4a0d..38fce73b 100755
--- a/Plugin/Plugin.m
+++ b/Plugin/Plugin.m
@@ -47,6 +47,7 @@ of this software and associated documentation files (the "Software"), to deal
 static NSString *sAutoLoadInvisibleFlashViewsKey = @"autoLoadInvisibleViews";
 static NSString *sPluginEnabled = @"pluginEnabled";
 static NSString *sApplicationWhitelist = @"applicationWhitelist";
+static NSString *sDrawGearImageOnlyOnMouseOverHiddenPref = @"drawGearImageOnlyOnMouseOver";
 
 BOOL usingMATrackingArea = NO;
 
@@ -869,8 +870,12 @@ - (void) _drawBackground
     [ self _drawBadgeWithPressed: mouseIsDown && mouseInside ];
     
     // Draw the gear icon
-    if( mouseInside && !mouseIsDown )
-        [ self _drawGearIcon ];
+	if ([[CTFUserDefaultsController standardUserDefaults] boolForKey:sDrawGearImageOnlyOnMouseOverHiddenPref]) {
+		if( mouseInside && !mouseIsDown )
+			[ self _drawGearIcon ];
+	} else {
+		[ self _drawGearIcon ];
+	}
 }
 
 - (void) _addTrackingAreaForCTF