diff --git a/src/002-config/mousetrapConfig.js b/src/002-config/mousetrapConfig.js
index ffcfcb7b0d3da9e458b5d6d55e630b34349bf52a..c4cb6d42a4f62d533527eed93af1a96652318c55 100644
--- a/src/002-config/mousetrapConfig.js
+++ b/src/002-config/mousetrapConfig.js
@@ -238,6 +238,7 @@ App.UI.Hotkeys = (function() {
 			// discard obsolete hotkeys
 			if (actions[saveKey]) {
 				actions[saveKey].combinations = save[saveKey];
+				addBinding(saveKey, save[saveKey]);
 			}
 		}
 	}
diff --git a/src/js/eventHandlers.js b/src/js/eventHandlers.js
index f14431042abe44d14087718351f99e04421f7c82..9942b621297570890298d38d5fda9ec658ee5e4a 100644
--- a/src/js/eventHandlers.js
+++ b/src/js/eventHandlers.js
@@ -22,6 +22,7 @@ App.EventHandlers = function() {
 	}
 
 	function storyReady() {
+		App.UI.Hotkeys.init();
 	}
 
 	function optionsChanged() {
diff --git a/src/zz1-last/setupEventHandlers.js b/src/zz1-last/setupEventHandlers.js
index 593787eae840212bd4fdbfc1beb51a72738348e5..0a6ef4160227ad480de47f3b895c24cc870cd2ba 100644
--- a/src/zz1-last/setupEventHandlers.js
+++ b/src/zz1-last/setupEventHandlers.js
@@ -4,7 +4,6 @@ Config.saves.onSave = App.EventHandlers.onSave;
 
 $(document).on(':storyready', function() {
 	App.EventHandlers.storyReady();
-	App.UI.Hotkeys.init();
 });
 
 $(document).one(':passagestart', function() {