diff --git a/src/myevents.h b/src/myevents.h
index 52f921b4..35145a40 100755
--- a/src/myevents.h
+++ b/src/myevents.h
@@ -8,7 +8,7 @@ BEGIN_EVENT_TABLE(treesheets::MyFrame, wxFrame)
   EVT_TEXT_ENTER(A_REPLACE, treesheets::MyFrame::OnSearchReplaceEnter)
   EVT_CLOSE(treesheets::MyFrame::OnClosing)
   EVT_MAXIMIZE(treesheets::MyFrame::OnMaximize)
-  EVT_ACTIVATE(treesheets::MyFrame::OnActivate)
+  EVT_ACTIVATE_APP(treesheets::MyFrame::OnActivate)
   EVT_COMBOBOX(A_CELLCOLOR, treesheets::MyFrame::OnChangeColor)
   EVT_COMBOBOX(A_TEXTCOLOR, treesheets::MyFrame::OnChangeColor)
   EVT_COMBOBOX(A_BORDCOLOR, treesheets::MyFrame::OnChangeColor)
diff --git a/src/myframe.h b/src/myframe.h
index 96e064aa..e0d89dc3 100755
--- a/src/myframe.h
+++ b/src/myframe.h
@@ -1105,9 +1105,6 @@ struct MyFrame : wxFrame {
     void OnActivate(wxActivateEvent &ae) {
         // This causes warnings in the debug log, but without it keyboard entry upon window select
         // doesn't work.
-        #ifdef __WXGTK__
-        if (HasFocus())
-        #endif
         ReFocus();
     }