diff --git a/gui/builtinShipBrowser/fitItem.py b/gui/builtinShipBrowser/fitItem.py
index 44949bda3..b44e8f36f 100644
--- a/gui/builtinShipBrowser/fitItem.py
+++ b/gui/builtinShipBrowser/fitItem.py
@@ -291,7 +291,9 @@ class FitItem(SFItem.SFBrowserItem):
         event.Skip()
 
     def editCheckEsc(self, event):
-        if event.GetKeyCode() == wx.WXK_ESCAPE:
+        keycode = event.GetKeyCode()
+        mstate = wx.GetMouseState()
+        if keycode == wx.WXK_ESCAPE and mstate.GetModifiers() == wx.MOD_NONE:
             self.RestoreEditButton()
         else:
             event.Skip()
diff --git a/gui/builtinShipBrowser/navigationPanel.py b/gui/builtinShipBrowser/navigationPanel.py
index e7f339260..fe0051144 100644
--- a/gui/builtinShipBrowser/navigationPanel.py
+++ b/gui/builtinShipBrowser/navigationPanel.py
@@ -105,7 +105,9 @@ class NavigationPanel(SFItem.SFBrowserItem):
         self.BrowserSearchBox.Show(False)
 
     def OnBrowserSearchBoxKeyPress(self, event):
-        if event.GetKeyCode() == wx.WXK_ESCAPE:
+        keycode = event.GetKeyCode()
+        mstate = wx.GetMouseState()
+        if keycode == wx.WXK_ESCAPE and mstate.GetModifiers() == wx.MOD_NONE:
             self.BrowserSearchBox.Show(False)
         elif event.RawControlDown() and event.GetKeyCode() == wx.WXK_BACK:
             HandleCtrlBackspace(self.BrowserSearchBox)
diff --git a/gui/builtinShipBrowser/shipItem.py b/gui/builtinShipBrowser/shipItem.py
index 57efe2978..9a61780a0 100644
--- a/gui/builtinShipBrowser/shipItem.py
+++ b/gui/builtinShipBrowser/shipItem.py
@@ -175,7 +175,9 @@ class ShipItem(SFItem.SFBrowserItem):
         self.Refresh()
 
     def editCheckEsc(self, event):
-        if event.GetKeyCode() == wx.WXK_ESCAPE:
+        keycode = event.GetKeyCode()
+        mstate = wx.GetMouseState()
+        if keycode == wx.WXK_ESCAPE and mstate.GetModifiers() == wx.MOD_NONE:
             self.tcFitName.Show(False)
         else:
             event.Skip()
diff --git a/gui/characterEditor.py b/gui/characterEditor.py
index 69f6862b5..1f46f429f 100644
--- a/gui/characterEditor.py
+++ b/gui/characterEditor.py
@@ -256,7 +256,8 @@ class CharacterEditor(wx.Frame):
 
     def kbEvent(self, event):
         keycode = event.GetKeyCode()
-        if keycode == wx.WXK_ESCAPE:
+        mstate = wx.GetMouseState()
+        if keycode == wx.WXK_ESCAPE and mstate.GetModifiers() == wx.MOD_NONE:
             self.closeWindow()
             return
         event.Skip()
diff --git a/gui/esiFittings.py b/gui/esiFittings.py
index 244df76ec..bc499e84d 100644
--- a/gui/esiFittings.py
+++ b/gui/esiFittings.py
@@ -96,7 +96,8 @@ class EveFittings(wx.Frame):
 
     def kbEvent(self, event):
         keycode = event.GetKeyCode()
-        if keycode == wx.WXK_ESCAPE:
+        mstate = wx.GetMouseState()
+        if keycode == wx.WXK_ESCAPE and mstate.GetModifiers() == wx.MOD_NONE:
             self.closeWindow()
             return
         event.Skip()
@@ -250,7 +251,8 @@ class ExportToEve(wx.Frame):
 
     def kbEvent(self, event):
         keycode = event.GetKeyCode()
-        if keycode == wx.WXK_ESCAPE:
+        mstate = wx.GetMouseState()
+        if keycode == wx.WXK_ESCAPE and mstate.GetModifiers() == wx.MOD_NONE:
             self.closeWindow()
             return
         event.Skip()
@@ -353,7 +355,8 @@ class SsoCharacterMgmt(wx.Dialog):
 
     def kbEvent(self, event):
         keycode = event.GetKeyCode()
-        if keycode == wx.WXK_ESCAPE:
+        mstate = wx.GetMouseState()
+        if keycode == wx.WXK_ESCAPE and mstate.GetModifiers() == wx.MOD_NONE:
             self.closeWindow()
             return
         event.Skip()
diff --git a/gui/graphFrame.py b/gui/graphFrame.py
index 039f5e478..d79718614 100644
--- a/gui/graphFrame.py
+++ b/gui/graphFrame.py
@@ -182,7 +182,8 @@ class GraphFrame(wx.Frame):
 
     def kbEvent(self, event):
         keycode = event.GetKeyCode()
-        if keycode == wx.WXK_ESCAPE:
+        mstate = wx.GetMouseState()
+        if keycode == wx.WXK_ESCAPE and mstate.GetModifiers() == wx.MOD_NONE:
             self.closeWindow()
             return
         event.Skip()
diff --git a/gui/itemStats.py b/gui/itemStats.py
index 80544dd43..b17cea954 100644
--- a/gui/itemStats.py
+++ b/gui/itemStats.py
@@ -140,7 +140,8 @@ class ItemStatsDialog(wx.Dialog):
 
     def kbEvent(self, event):
         keycode = event.GetKeyCode()
-        if keycode == wx.WXK_ESCAPE:
+        mstate = wx.GetMouseState()
+        if keycode == wx.WXK_ESCAPE and mstate.GetModifiers() == wx.MOD_NONE:
             self.closeWindow()
             return
         event.Skip()
diff --git a/gui/patternEditor.py b/gui/patternEditor.py
index 6c0dfc6d7..670971f8e 100644
--- a/gui/patternEditor.py
+++ b/gui/patternEditor.py
@@ -276,7 +276,8 @@ class DmgPatternEditorDlg(wx.Dialog):
 
     def kbEvent(self, event):
         keycode = event.GetKeyCode()
-        if keycode == wx.WXK_ESCAPE:
+        mstate = wx.GetMouseState()
+        if keycode == wx.WXK_ESCAPE and mstate.GetModifiers() == wx.MOD_NONE:
             self.closeWindow()
             return
         event.Skip()
diff --git a/gui/preferenceDialog.py b/gui/preferenceDialog.py
index 382dc0441..6e0ba76ec 100644
--- a/gui/preferenceDialog.py
+++ b/gui/preferenceDialog.py
@@ -82,7 +82,8 @@ class PreferenceDialog(wx.Dialog):
 
     def kbEvent(self, event):
         keycode = event.GetKeyCode()
-        if keycode == wx.WXK_ESCAPE:
+        mstate = wx.GetMouseState()
+        if keycode == wx.WXK_ESCAPE and mstate.GetModifiers() == wx.MOD_NONE:
             self.closeWindow()
             return
         event.Skip()
diff --git a/gui/propertyEditor.py b/gui/propertyEditor.py
index 8010481de..cf4213276 100644
--- a/gui/propertyEditor.py
+++ b/gui/propertyEditor.py
@@ -94,7 +94,8 @@ class AttributeEditor(wx.Frame):
 
     def kbEvent(self, event):
         keycode = event.GetKeyCode()
-        if keycode == wx.WXK_ESCAPE:
+        mstate = wx.GetMouseState()
+        if keycode == wx.WXK_ESCAPE and mstate.GetModifiers() == wx.MOD_NONE:
             self.closeWindow()
             return
         event.Skip()
diff --git a/gui/resistsEditor.py b/gui/resistsEditor.py
index f2136a0ff..911349639 100644
--- a/gui/resistsEditor.py
+++ b/gui/resistsEditor.py
@@ -296,7 +296,8 @@ class ResistsEditorDlg(wx.Dialog):
 
     def kbEvent(self, event):
         keycode = event.GetKeyCode()
-        if keycode == wx.WXK_ESCAPE:
+        mstate = wx.GetMouseState()
+        if keycode == wx.WXK_ESCAPE and mstate.GetModifiers() == wx.MOD_NONE:
             self.closeWindow()
             return
         event.Skip()
diff --git a/gui/setEditor.py b/gui/setEditor.py
index 7d592d491..9557c65b8 100644
--- a/gui/setEditor.py
+++ b/gui/setEditor.py
@@ -184,7 +184,8 @@ class ImplantSetEditorDlg(wx.Dialog):
 
     def kbEvent(self, event):
         keycode = event.GetKeyCode()
-        if keycode == wx.WXK_ESCAPE:
+        mstate = wx.GetMouseState()
+        if keycode == wx.WXK_ESCAPE and mstate.GetModifiers() == wx.MOD_NONE:
             self.closeWindow()
             return
         event.Skip()