diff --git a/src/edframe.cpp b/src/edframe.cpp
index c44f619c1a..16f9669ed0 100644
--- a/src/edframe.cpp
+++ b/src/edframe.cpp
@@ -879,7 +879,7 @@ void PoeditFrame::DestroyContentView()
     if (m_findWindow)
     {
         m_findWindow->Destroy();
-        m_findWindow.Release();
+        m_findWindow.reset();
     }
 }
 
@@ -920,6 +920,8 @@ void PoeditFrame::SetAccelerators()
         { wxACCEL_CTRL, WXK_F3,                 XRCID("menu_find_next") },
         { wxACCEL_CTRL | wxACCEL_SHIFT, WXK_F3, XRCID("menu_find_prev") },
 #endif
+        { wxACCEL_CTRL, wxKeyCode('G'),                     XRCID("menu_find_next") },
+        { wxACCEL_CTRL | wxACCEL_SHIFT, wxKeyCode('G'),     XRCID("menu_find_prev") },
 
         { wxACCEL_CTRL, WXK_PAGEUP,             XRCID("go_prev_page") },
         { wxACCEL_CTRL, WXK_NUMPAD_PAGEUP,      XRCID("go_prev_page") },
diff --git a/src/edframe.h b/src/edframe.h
index 37ed538c7c..d173d63381 100644
--- a/src/edframe.h
+++ b/src/edframe.h
@@ -392,7 +392,7 @@ class PoeditFrame : public wxFrame
 
         AttentionBar *m_attentionBar;
         Sidebar *m_sidebar;
-        wxWeakRef<FindFrame> m_findWindow;
+        wxSharedPtr<FindFrame> m_findWindow;
 
         bool m_modified;
         bool m_hasObsoleteItems;
diff --git a/src/findframe.cpp b/src/findframe.cpp
index 0462098a49..18c6dfe9cc 100644
--- a/src/findframe.cpp
+++ b/src/findframe.cpp
@@ -280,7 +280,7 @@ void FindFrame::DoShowFor(int mode)
 
 void FindFrame::OnClose(wxCommandEvent&)
 {
-    Destroy();
+    Show(false);
 }