diff --git a/ZRCola/zrcolaapp.cpp b/ZRCola/zrcolaapp.cpp
index 48904be..04f5ae4 100644
--- a/ZRCola/zrcolaapp.cpp
+++ b/ZRCola/zrcolaapp.cpp
@@ -104,6 +104,14 @@ bool ZRColaApp::OnInit()
                             m_lang_db.idxLng.clear();
                             m_lang_db.data  .clear();
                         }
+                    } else if (id == ZRCola::keyseq_rec::id) {
+                        dat >> ZRCola::keyseq_rec(m_ks_db);
+                        if (!dat.good()) {
+                            wxFAIL_MSG(wxT("Error reading key sequences data from ZRCola.zrcdb."));
+                            m_ks_db.idxChr.clear();
+                            m_ks_db.idxKey.clear();
+                            m_ks_db.data  .clear();
+                        }
                     }
                 }
 
diff --git a/ZRCola/zrcolaapp.h b/ZRCola/zrcolaapp.h
index 1a0f01d..bbfccc2 100644
--- a/ZRCola/zrcolaapp.h
+++ b/ZRCola/zrcolaapp.h
@@ -31,6 +31,7 @@ class ZRColaApp;
 #include <wx/intl.h>
 #include <zrcola/language.h>
 #include <zrcola/translate.h>
+#include <zrcolaui/keyboard.h>
 
 
 ///
@@ -61,6 +62,7 @@ public:
     ZRCola::translation_db m_t_db;  ///< Translation database
     ZRCola::langchar_db m_lc_db;    ///< Language character database
     ZRCola::language_db m_lang_db;  ///< Language database
+    ZRCola::keyseq_db m_ks_db;      ///< Key sequence database
 
     wxZRColaFrame *m_mainWnd;       ///< Main window
 
diff --git a/ZRCola/zrcolakeyhndlr.cpp b/ZRCola/zrcolakeyhndlr.cpp
index bd2db0f..76b6b9b 100644
--- a/ZRCola/zrcolakeyhndlr.cpp
+++ b/ZRCola/zrcolakeyhndlr.cpp
@@ -28,27 +28,6 @@ wxZRColaKeyHandler::wxZRColaKeyHandler() :
     m_is_insert(false),
     wxEvtHandler()
 {
-    std::fstream dat((LPCTSTR)((ZRColaApp*)wxTheApp)->GetDatabasePath(), std::ios_base::in | std::ios_base::binary);
-    if (dat.good()) {
-        if (stdex::idrec::find<ZRCola::recordid_t, ZRCola::recordsize_t, ZRCOLA_RECORD_ALIGN>(dat, ZRCOLA_DB_ID, sizeof(ZRCola::recordid_t))) {
-            ZRCola::recordsize_t size;
-            dat.read((char*)&size, sizeof(ZRCola::recordsize_t));
-            if (dat.good()) {
-                ZRCola::keyseq_rec rec(m_ks_db);
-                if (rec.find(dat, size)) {
-                    dat >> rec;
-                    if (!dat.good()) {
-                        wxFAIL_MSG(wxT("Error reading translation data from ZRCola.zrcdb."));
-                        m_ks_db.idxChr.clear();
-                        m_ks_db.idxKey.clear();
-                        m_ks_db.data  .clear();
-                    }
-                } else
-                    wxFAIL_MSG(wxT("ZRCola.zrcdb has no translation data."));
-            }
-        } else
-            wxFAIL_MSG(wxT("ZRCola.zrcdb is not a valid ZRCola database."));
-    }
 }
 
 
@@ -60,12 +39,12 @@ bool wxZRColaKeyHandler::ProcessEvent(wxEvent& event)
         if (e.GetKeyCode() == WXK_INSERT) {
             // Insert key has been pressed.
             m_is_insert = true;
-            wxFrame *pFrame = wxDynamicCast(wxTheApp->GetTopWindow(), wxFrame);
+            wxFrame *pFrame = wxDynamicCast(((ZRColaApp*)wxTheApp)->m_mainWnd, wxFrame);
             if (pFrame && pFrame->GetStatusBar())
                 pFrame->SetStatusText(_("INS key is pressed. Type the Unicode code of desired character now (up to four hexadecimal digits: 0-9, A-F), then release INS."));
         } else if (m_is_insert) {
             wxChar chr = e.GetUnicodeKey();
-            wxFrame *pFrame = wxDynamicCast(wxTheApp->GetTopWindow(), wxFrame);
+            wxFrame *pFrame = wxDynamicCast(((ZRColaApp*)wxTheApp)->m_mainWnd, wxFrame);
             if (('0' <= chr && chr <= '9' || 'A' <= chr && chr <= 'F') && m_insert_seq.size() < 4) {
                 // A hex-digit pressed. Save it.
                 m_insert_seq.push_back((char)chr);
@@ -84,9 +63,10 @@ bool wxZRColaKeyHandler::ProcessEvent(wxEvent& event)
                     pFrame->SetStatusText(wxEmptyString);
             }
         } else if (e.GetUnicodeKey() || !e.HasAnyModifiers()) {
+            ZRColaApp *app = (ZRColaApp*)wxTheApp;
             ZRCola::keyseq_db::indexKey::size_type start, end;
             bool found;
-            wxFrame *pFrame = wxDynamicCast(wxTheApp->GetTopWindow(), wxFrame);
+            wxFrame *pFrame = wxDynamicCast(app->m_mainWnd, wxFrame);
 
             {
                 // Parse key event and save it at the end of the key sequence.
@@ -103,13 +83,13 @@ bool wxZRColaKeyHandler::ProcessEvent(wxEvent& event)
                 ks->chr = 0;
                 ks->seq_len = n;
                 memcpy(ks->seq, m_seq.data(), sizeof(ZRCola::keyseq_db::keyseq::key_t)*n);
-                found = m_ks_db.idxKey.find(*ks, start, end);
+                found = app->m_ks_db.idxKey.find(*ks, start, end);
                 delete ks;
             }
 
             if (found) {
                 // The exact key sequence found.
-                const ZRCola::keyseq_db::keyseq &ks = m_ks_db.idxKey[start];
+                const ZRCola::keyseq_db::keyseq &ks = app->m_ks_db.idxKey[start];
                 m_seq.clear();
 
                 if (pFrame && pFrame->GetStatusBar())
@@ -124,8 +104,8 @@ bool wxZRColaKeyHandler::ProcessEvent(wxEvent& event)
                     event.StopPropagation();
                     return true;
                 }
-            } else if (start < m_ks_db.idxKey.size() &&
-                ZRCola::keyseq_db::keyseq::CompareSequence(m_seq.data(), m_seq.size(), m_ks_db.idxKey[start].seq, std::min<unsigned __int16>(m_ks_db.idxKey[start].seq_len, m_seq.size())) == 0)
+            } else if (start < app->m_ks_db.idxKey.size() &&
+                ZRCola::keyseq_db::keyseq::CompareSequence(m_seq.data(), m_seq.size(), app->m_ks_db.idxKey[start].seq, std::min<unsigned __int16>(app->m_ks_db.idxKey[start].seq_len, m_seq.size())) == 0)
             {
                 // The sequence is a partial match. Continue watching.
                 if (pFrame && pFrame->GetStatusBar())
@@ -145,7 +125,7 @@ bool wxZRColaKeyHandler::ProcessEvent(wxEvent& event)
         wxKeyEvent &e = (wxKeyEvent&)event;
         if (e.GetKeyCode() == WXK_INSERT && m_is_insert) {
             // Insert key has been depressed.
-            wxFrame *pFrame = wxDynamicCast(wxTheApp->GetTopWindow(), wxFrame);
+            wxFrame *pFrame = wxDynamicCast(((ZRColaApp*)wxTheApp)->m_mainWnd, wxFrame);
             if (pFrame && pFrame->GetStatusBar())
                 pFrame->SetStatusText(wxEmptyString);
 
diff --git a/ZRCola/zrcolakeyhndlr.h b/ZRCola/zrcolakeyhndlr.h
index 5c8a1ca..7b8347b 100644
--- a/ZRCola/zrcolakeyhndlr.h
+++ b/ZRCola/zrcolakeyhndlr.h
@@ -25,7 +25,6 @@ class wxZRColaKeyHandler;
 
 #pragma once
 
-#include <zrcolaui/keyboard.h>
 #include <wx/event.h>
 #include <vector>
 
@@ -41,7 +40,6 @@ public:
     virtual bool ProcessEvent(wxEvent& event);
 
 protected:
-    ZRCola::keyseq_db m_ks_db;                              ///< Key sequence database
     std::vector<ZRCola::keyseq_db::keyseq::key_t> m_seq;    ///< Key sequence
     bool m_is_insert;                                       ///< Is Insert key pressed?
     std::vector<char> m_insert_seq;                         ///< The Insert char sequence