diff --git a/src/wx/opts.cpp b/src/wx/opts.cpp
index 20f59c17..5391704c 100644
--- a/src/wx/opts.cpp
+++ b/src/wx/opts.cpp
@@ -45,8 +45,13 @@ const wxAcceleratorEntry default_accels[] = {
     // maybe make alt-f4 universal as well...
     // FIXME: ctrl-Q does not work on wxMSW
     // FIXME: esc does not work on wxMSW
-    wxAcceleratorEntry(wxMOD_NONE, WXK_ESCAPE, wxID_EXIT),
-    wxAcceleratorEntry(wxMOD_CMD, wxT('X'), wxID_EXIT),
+
+    // this was annoying people A LOT #334
+    //wxAcceleratorEntry(wxMOD_NONE, WXK_ESCAPE, wxID_EXIT),
+
+    // this was annoying people #298
+    //wxAcceleratorEntry(wxMOD_CMD, wxT('X'), wxID_EXIT),
+
     wxAcceleratorEntry(wxMOD_CMD, wxT('Q'), wxID_EXIT),
     // FIXME: ctrl-W does not work on wxMSW
     wxAcceleratorEntry(wxMOD_CMD, wxT('W'), wxID_CLOSE),
diff --git a/src/wx/wxvbam.cpp b/src/wx/wxvbam.cpp
index 4c6311cf..01de4cf4 100644
--- a/src/wx/wxvbam.cpp
+++ b/src/wx/wxvbam.cpp
@@ -1048,23 +1048,23 @@ void MainFrame::IdentifyRom()
 // ctrl-w does not work for close).  It's possible another entity is
 // grabbing those keys, but I can't track it down.
 // FIXME: move this to MainFrame
-int wxvbamApp::FilterEvent(wxEvent& event)
-{
-    //if(frame && frame->IsPaused(true))
-    return -1;
-
-    if (event.GetEventType() == wxEVT_KEY_DOWN) {
-        wxKeyEvent& ke = (wxKeyEvent&)event;
-
-        for (int i = 0; i < accels.size(); i++) {
-            if (accels[i].GetKeyCode() == ke.GetKeyCode() && accels[i].GetFlags() == ke.GetModifiers()) {
-                wxCommandEvent ev(wxEVT_COMMAND_MENU_SELECTED, accels[i].GetCommand());
-                ev.SetEventObject(this);
-                frame->GetEventHandler()->ProcessEvent(ev);
-                return 1;
-            }
-        }
-    }
-
-    return -1;
-}
+//int wxvbamApp::FilterEvent(wxEvent& event)
+//{
+//    //if(frame && frame->IsPaused(true))
+//    return -1;
+//
+//    if (event.GetEventType() == wxEVT_KEY_DOWN) {
+//        wxKeyEvent& ke = (wxKeyEvent&)event;
+//
+//        for (int i = 0; i < accels.size(); i++) {
+//            if (accels[i].GetKeyCode() == ke.GetKeyCode() && accels[i].GetFlags() == ke.GetModifiers()) {
+//                wxCommandEvent ev(wxEVT_COMMAND_MENU_SELECTED, accels[i].GetCommand());
+//                ev.SetEventObject(this);
+//                frame->GetEventHandler()->ProcessEvent(ev);
+//                return 1;
+//            }
+//        }
+//    }
+//
+//    return -1;
+//}
diff --git a/src/wx/wxvbam.h b/src/wx/wxvbam.h
index 5ff50f87..a39da222 100644
--- a/src/wx/wxvbam.h
+++ b/src/wx/wxvbam.h
@@ -102,7 +102,7 @@ public:
     };
 #endif
     // without this, global accels don't always work
-    int FilterEvent(wxEvent& event);
+    //int FilterEvent(wxEvent& event);
     wxAcceleratorEntry_v accels;
 
     // the main configuration