diff --git a/zsnes/src/gui/guikeys.inc b/zsnes/src/gui/guikeys.inc
index 21e07c9f..9580e547 100644
--- a/zsnes/src/gui/guikeys.inc
+++ b/zsnes/src/gui/guikeys.inc
@@ -970,6 +970,9 @@ GUIGUIOptnsKeys:
     cmp dh,'F'
     jne .guioptn13
     xor byte[FilteredGUI],1
+    cmp byte[En2xSaI],1
+    jnae .guioptn13
+    call Clear2xSaIBuffer
 .guioptn13
     cmp dh,'R'
     jne .guioptn14
diff --git a/zsnes/src/gui/guimouse.inc b/zsnes/src/gui/guimouse.inc
index 8efa9da7..34dfc70e 100644
--- a/zsnes/src/gui/guimouse.inc
+++ b/zsnes/src/gui/guimouse.inc
@@ -15,6 +15,7 @@
 ;along with this program; if not, write to the Free Software
 ;Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+EXTSYM Clear2xSaIBuffer
 %ifdef __WIN32__
 EXTSYM CheckPriority
 EXTSYM CheckAlwaysOnTop
@@ -1304,6 +1305,22 @@ GUIWinClicked:
 %endif
 %endmacro
 
+%macro GUIClickCButtonI 3
+    cmp eax,%1+1
+    jl %%noclick
+    cmp edx,%2+3
+    jl %%noclick
+    cmp eax,%1+6
+    jg %%noclick
+    cmp edx,%2+8
+    jg %%noclick
+    xor %3,1
+    cmp byte[En2xSaI],1
+    jnae %%noclick
+    call Clear2xSaIBuffer
+%%noclick
+%endmacro
+
 %macro GUISlidebarPostImpl 13 ; x1,y1,x2,y2,upjump,downjump,holdpos,scsize,view,cur,listsize
     cmp dword[%11],0
     je near %%nolower
@@ -2692,7 +2709,7 @@ DisplayGUIOptnsClick:
     GUIClickCButton 124,33,byte[MouseWheel]
     GUIClickCButton 124,53,byte[TrapMouseCursor]
 %endif
-    GUIClickCButton 124,43,byte[FilteredGUI]
+    GUIClickCButtonI 124,43,byte[FilteredGUI]
     GUIPButtonHole 48,108,byte[CurPalSelect],0
     GUIPButtonHole 88,108,byte[CurPalSelect],1
     GUIPButtonHole 135,108,byte[CurPalSelect],2