diff --git a/apps/score/score.app.js b/apps/score/score.app.js
index f1c1a2bbf..4c995283b 100644
--- a/apps/score/score.app.js
+++ b/apps/score/score.app.js
@@ -151,14 +151,13 @@ function showSettingsMenu() {
     if (reset) {
       setupMatch();
     }
-    if (isBangle1 || back) {
-      settingsMenuOpened = null;
 
-      draw();
+    settingsMenuOpened = null;
 
-      setupDisplay();
-      setupInputWatchers();
-    }
+    draw();
+
+    setupDisplay();
+    setupInputWatchers();
   }, function (msg) {
     switch (msg) {
       case 'end_set':
diff --git a/apps/score/score.settings.js b/apps/score/score.settings.js
index 336635614..d5da0dd27 100644
--- a/apps/score/score.settings.js
+++ b/apps/score/score.settings.js
@@ -174,10 +174,10 @@
   const inAppMenu = function () {
     let m = {
       '': {'title': 'Score Menu'},
-      '< Back': function () { back(settings, changed, false); },
-      'Correct mode': function () { inApp('correct_mode'); back(settings, false, true); },
-      'Reset match': function () { back(settings, true, true); },
-      'End current set': function () { inApp('end_set'); back(settings, changed, true); },
+      '< Back': function () { back(settings, changed); },
+      'Correct mode': function () { inApp('correct_mode'); back(settings, false); },
+      'Reset match': function () { back(settings, true); },
+      'End current set': function () { inApp('end_set'); back(settings, changed); },
       'Configuration': function () { E.showMenu(appMenu(function () {
         E.showMenu(inAppMenu());
       })); },