1 files changed, 13 insertions, 0 deletions
diff --git a/gui/gui-manager.cpp b/gui/gui-manager.cpp
index 849044286d..98840e6daf 100644
--- a/gui/gui-manager.cpp
+++ b/gui/gui-manager.cpp
@@ -286,6 +286,15 @@ void GuiManager::runLoop() {
 	uint32 lastRedraw = 0;
 	const uint32 waitTime = 1000 / 45;
 
+#ifdef ENABLE_KEYMAPPER
+	// Due to circular reference with event manager and GUI
+	// we cannot init keymap on the GUI creation. Thus, let's
+	// try to do it on every launch, checking whether the
+	// map is already existing
+	initKeymap();
+	pushKeymap();
+#endif
+
 	bool tooltipCheck = false;
 
 	while (!_dialogStack.empty() && activeDialog == getTopDialog()) {
@@ -397,6 +406,10 @@ void GuiManager::runLoop() {
 		_system->delayMillis(10);
 	}
 
+#ifdef ENABLE_KEYMAPPER
+	popKeymap();
+#endif
+
 	if (didSaveState) {
 		_theme->disable();
 		restoreState();