diff --git a/client/forbidden-markers-configuration-map.html b/client/forbidden-markers-configuration-map.html
index 3efc1de7..5d5369f8 100644
--- a/client/forbidden-markers-configuration-map.html
+++ b/client/forbidden-markers-configuration-map.html
@@ -29,7 +29,8 @@
 
         const topPage = fn.getTopPage();
         map.initCanvas(topPage.data.map, {metaData: false, noGotoPoints: true});
-        window.fn.map = map;
+
+        document.querySelector("#forbidden-markers-configuration-map-page ons-back-button").onClick = () => fn.popPage(); // case matters!
 
         if (topPage.data.map.no_go_areas)
         for (let zone of topPage.data.map.no_go_areas) {
diff --git a/client/index.html b/client/index.html
index ae707e5d..f4addf4b 100644
--- a/client/index.html
+++ b/client/index.html
@@ -50,6 +50,12 @@
 
         window.fn.popPage = function() {
             document.getElementById('appNavigator').popPage();
+            let stateObj = {moveView: (history.state && history.state.moveView || 0)};
+            if (history.state && history.state.moveSubPage && history.state.moveSubPage.length > 1) {
+                stateObj.moveSubPage = history.state.moveSubPage.splice(0);
+                stateObj.moveSubPage.shift();
+            }
+            history.pushState(stateObj, "");
         }
 
         window.fn.getTopPage = function() {
diff --git a/client/settings-access-control.html b/client/settings-access-control.html
index 84f72f19..96bb7850 100644
--- a/client/settings-access-control.html
+++ b/client/settings-access-control.html
@@ -108,6 +108,8 @@
         var sshKeysTitle = document.getElementById('settings-access-control-ssh-keys-title');
         var sshKeysList = document.getElementById('settings-access-control-ssh-keys-list');
 
+        document.querySelector("#settings-access-control ons-back-button").onClick = () => fn.popPage(); // case matters!
+
         ons.getScriptPage().onShow = function() {
             updateSettingsAccessControlPage();
         };
diff --git a/client/settings-carpet-mode.html b/client/settings-carpet-mode.html
index f805d0ea..94b6bdc7 100644
--- a/client/settings-carpet-mode.html
+++ b/client/settings-carpet-mode.html
@@ -62,6 +62,8 @@
     <script>
         var loadingBarSettingsCarpetMode = document.getElementById('loading-bar-settings-carpet-mode');
 
+        document.querySelector("#settings-carpet-mode-page ons-back-button").onClick = () => fn.popPage(); // case matters!
+
         ons.getScriptPage().onShow = function () {
             updateSettingsCarpetModePage();
         };
diff --git a/client/settings-cleaning-history-map.html b/client/settings-cleaning-history-map.html
index 2396c422..c86ce715 100644
--- a/client/settings-cleaning-history-map.html
+++ b/client/settings-cleaning-history-map.html
@@ -12,6 +12,8 @@
         import { VacuumMap } from "./zone/js-modules/vacuum-map.js"
         const map = new VacuumMap(document.getElementById('cleaning-history-map'));
 
+        document.querySelector("#settings-cleaning-history-map-page ons-back-button").onClick = () => fn.popPage(); // case matters!
+
         const topPage = fn.getTopPage();
         const cleaningDate = topPage.data.cleaningDate;
 
diff --git a/client/settings-cleaning-history.html b/client/settings-cleaning-history.html
index b3637c84..30841dd0 100644
--- a/client/settings-cleaning-history.html
+++ b/client/settings-cleaning-history.html
@@ -22,6 +22,8 @@
         var historyArray, timeZone;
         var mapDataCached = null;
 
+        document.querySelector("#settings-cleaning-history-page ons-back-button").onClick = () => fn.popPage(); // case matters!
+
         ons.getScriptPage().onInit = function () {
             updateSettingsCleaningHistoryPage();
         };
diff --git a/client/settings-consumables.html b/client/settings-consumables.html
index 703aa2cc..8a90081e 100644
--- a/client/settings-consumables.html
+++ b/client/settings-consumables.html
@@ -95,6 +95,8 @@
         var consumableStatisticsHours = document.getElementById('settings-consumables-status-statistics-hours');
         var consumableStatisticsCount = document.getElementById('settings-consumables-status-statistics-count');
 
+        document.querySelector("#settings-consumables-page ons-back-button").onClick = () => fn.popPage(); // case matters!
+
         ons.getScriptPage().onShow = function () {
             updateSettingsConsumablesPage();
         };
diff --git a/client/settings-info.html b/client/settings-info.html
index 4a4cef3f..e41d6c7f 100644
--- a/client/settings-info.html
+++ b/client/settings-info.html
@@ -107,11 +107,11 @@
         </ons-list-item>
     </ons-list>
 
-
-
-
     <script>
         var loadingBarSettingsInfo = document.getElementById('loading-bar-settings-info');
+
+        document.querySelector("#settings-info-page ons-back-button").onClick = () => fn.popPage(); // case matters!
+
         ons.getScriptPage().onShow = function() {
             updateSettingsInfoPage();
         };
diff --git a/client/settings-persistent-data.html b/client/settings-persistent-data.html
index 3d5f7deb..21c1a248 100644
--- a/client/settings-persistent-data.html
+++ b/client/settings-persistent-data.html
@@ -99,6 +99,8 @@
     <script>
         var loadingBarSettingsPersistentData = document.getElementById('loading-bar-settings-persistent-data');
 
+        document.querySelector("#settings-persistent-data-page ons-back-button").onClick = () => fn.popPage(); // case matters!
+
         ons.getScriptPage().onShow = function () {
             document.getElementById('lab_mode_enabled').addEventListener("change", function(event) {
                 disableResetMap(!event.target.checked)
diff --git a/client/settings-sound-voice.html b/client/settings-sound-voice.html
index 61bb0305..0bf26f1e 100644
--- a/client/settings-sound-voice.html
+++ b/client/settings-sound-voice.html
@@ -66,6 +66,8 @@
         var voicePackUploadButton = document.getElementById('settings-sound-voice-upload-pack-button');
         var voicePackFileBrowser = document.getElementById('settings-sound-voice-upload-browser');
 
+        document.querySelector("#settings-sound-voice ons-back-button").onClick = () => fn.popPage(); // case matters!
+
         ons.getScriptPage().onShow = function() {
             updateSettingsSoundVolumePage();
         };
diff --git a/client/settings-timers.html b/client/settings-timers.html
index 1dfe6f79..bfb16ea4 100644
--- a/client/settings-timers.html
+++ b/client/settings-timers.html
@@ -213,6 +213,8 @@
 
         var zTimers = [];
 
+        document.querySelector("#settings-timers-page ons-back-button").onClick = () => fn.popPage(); // case matters!
+
         ons.getScriptPage().onShow = function () {
             updateSettingsZonedTimersPage();
             updateSettingsTimersPage();
diff --git a/client/settings-token.html b/client/settings-token.html
index e332a57f..79239e55 100644
--- a/client/settings-token.html
+++ b/client/settings-token.html
@@ -26,6 +26,8 @@
         var loadingBarSettingsToken = document.getElementById('loading-bar-settings-token');
         var settingsTokenLabel = document.getElementById('settings-token-label');
 
+        document.querySelector("#settings-token-page ons-back-button").onClick = () => fn.popPage(); // case matters!
+
         ons.getScriptPage().onShow = function () {
             updateSettingsTokenPage();
         };
diff --git a/client/settings-wifi.html b/client/settings-wifi.html
index 72c015a5..e5eb49e9 100644
--- a/client/settings-wifi.html
+++ b/client/settings-wifi.html
@@ -85,6 +85,7 @@
         wifiInputSSID.addEventListener('input', updateWifiCredentialsSaveButton);
         wifiInputPassword.addEventListener('input', updateWifiCredentialsSaveButton);
 
+        document.querySelector("#settings-wifi-page ons-back-button").onClick = () => fn.popPage(); // case matters!
 
         ons.getScriptPage().onShow = function() {
             updateSettingsWifiPage();
diff --git a/client/spot-configuration-map.html b/client/spot-configuration-map.html
index 8a945059..03c90f34 100644
--- a/client/spot-configuration-map.html
+++ b/client/spot-configuration-map.html
@@ -27,6 +27,8 @@
 
         map.initCanvas(topPage.data.map, {metaData: "forbidden"});
 
+        document.querySelector("#spot-configuration-map-page ons-back-button").onClick = () => fn.popPage(); // case matters!
+
         document.getElementById("spot-configuration-map-page-h1").innerText = `Editing spot: ${spotConfig[spotToModify].name}`;
 
         map.addSpot([spotConfig[spotToModify].coordinates[0], spotConfig[spotToModify].coordinates[1]]);
diff --git a/client/zones-configuration-map.html b/client/zones-configuration-map.html
index a54edf87..59c8b944 100644
--- a/client/zones-configuration-map.html
+++ b/client/zones-configuration-map.html
@@ -33,6 +33,8 @@
 
         map.initCanvas(topPage.data.map, {metaData: "forbidden", noGotoPoints: true});
 
+        document.querySelector("#zones-configuration-map-page ons-back-button").onClick = () => fn.popPage(); // case matters!
+
         document.getElementById("zones-configuration-map-page-h1").innerText = `Editing zone: ${zonesConfig[zoneToModify].name}`;
         for(let zone of zonesConfig[zoneToModify].coordinates) {
             map.addZone([zone[0], zone[1], zone[2], zone[3]], true);