diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 5dcb2408b..34b1657cf 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -14,6 +14,8 @@ musikdroid:
 * changed general music browse experience to be tab-based with with modern
   scrolling behaviors. this results in fewer clicks to find music and more
   screen real estate.
+* fixed elusive bug that would cause lock screen controls to stop functioning
+  sometimes, on some devices.
 * massive cleanup and refactor to old code, making it more modular and easier
   to compose.
 
diff --git a/src/musikcube/app/layout/ConsoleLayout.cpp b/src/musikcube/app/layout/ConsoleLayout.cpp
index 782d0f448..272531ef5 100755
--- a/src/musikcube/app/layout/ConsoleLayout.cpp
+++ b/src/musikcube/app/layout/ConsoleLayout.cpp
@@ -57,11 +57,7 @@ void ConsoleLayout::OnItemActivated(cursespp::ListWindow* window, size_t index)
 }
 
 bool ConsoleLayout::KeyPress(const std::string& kn) {
-    if (kn == "^_" || kn == "M-v") { /* ctrl+/ */
-        ToastOverlay::Show(u8fmt(_TSTR("console_version"), VERSION), -1);
-        return true;
-    }
-    else if (kn == "x") {
+    if (kn == "x") {
         this->adapter->Clear();
         return true;
     }
diff --git a/src/musikcube/app/layout/MainLayout.cpp b/src/musikcube/app/layout/MainLayout.cpp
index 324171882..72bcd5b7f 100755
--- a/src/musikcube/app/layout/MainLayout.cpp
+++ b/src/musikcube/app/layout/MainLayout.cpp
@@ -36,6 +36,7 @@
 
 #include <cursespp/Screen.h>
 #include <cursespp/Colors.h>
+#include <cursespp/ToastOverlay.h>
 
 #include <core/runtime/Message.h>
 
@@ -47,6 +48,7 @@
 #include <app/layout/SettingsLayout.h>
 #include <app/layout/HotkeysLayout.h>
 #include <app/util/Hotkeys.h>
+#include <app/version.h>
 
 #include <map>
 
@@ -154,6 +156,10 @@ bool MainLayout::KeyPress(const std::string& key) {
         this->SetLayout(settingsLayout);
         return true;
     }
+    else if (key == "M-`") {
+        ToastOverlay::Show(u8fmt(_TSTR("console_version"), VERSION), -1);
+        return true;
+    }
 
     return AppLayout::KeyPress(key);
 }
diff --git a/src/musikcube/app/layout/SettingsLayout.cpp b/src/musikcube/app/layout/SettingsLayout.cpp
index 09d02cdba..b130636fd 100755
--- a/src/musikcube/app/layout/SettingsLayout.cpp
+++ b/src/musikcube/app/layout/SettingsLayout.cpp
@@ -37,7 +37,6 @@
 #include <cursespp/App.h>
 #include <cursespp/Colors.h>
 #include <cursespp/DialogOverlay.h>
-#include <cursespp/ToastOverlay.h>
 #include <cursespp/InputOverlay.h>
 #include <cursespp/Screen.h>
 #include <cursespp/SingleLineEntry.h>
@@ -48,7 +47,6 @@
 #include <core/audio/Outputs.h>
 #include <core/support/Messages.h>
 
-#include <app/version.h>
 #include <app/util/Hotkeys.h>
 #include <app/util/Messages.h>
 #include <app/util/PreferenceKeys.h>
@@ -713,10 +711,6 @@ bool SettingsLayout::KeyPress(const std::string& key) {
             return true;
         }
     }
-    if (key == "^_" || key == "M-v") { /* ctrl+/ */
-        ToastOverlay::Show(u8fmt(_TSTR("console_version"), VERSION), -1);
-        return true;
-    }
 
     return LayoutBase::KeyPress(key);
 }