diff --git a/keybindings.js b/keybindings.js
index 99a1dd4..5e6ade8 100755
--- a/keybindings.js
+++ b/keybindings.js
@@ -34,8 +34,8 @@ var KEYBOARD_CONFIG = {
 			}),
 	},	
 
-	'.overlay': {
-		title: 'Overlay mode.',
+	'Overlay mode.': {
+		pattern: '.overlay',
 		doc: '',
 
 		ignore: '*',
@@ -46,8 +46,8 @@ var KEYBOARD_CONFIG = {
 			},
 	},
 
-	'.editor:not(.inline-editor-mode)': {
-		title: 'Editor mode.',
+	'Editor mode.': {
+		pattern: '.editor:not(.inline-editor-mode)',
 		doc: '',
 
 		'0': function(){
@@ -115,8 +115,8 @@ var KEYBOARD_CONFIG = {
 	},
 
 	// ignore all keys except Esc here...
-	'.inline-editor-mode': {
-		title: 'Inline editor mode.',
+	'Inline editor mode.': {
+		pattern: '.inline-editor-mode',
 		doc: '',
 
 		//ignore: '*'
@@ -126,8 +126,8 @@ var KEYBOARD_CONFIG = {
 			},
 	},
 
-	'.chrome:not(.inline-editor-mode)': {
-		title: 'Global bindings.',
+	'Global bindings.': {
+		pattern: '.chrome:not(.inline-editor-mode)',
 		doc: '',
 
 		Esc: function(){
diff --git a/magazine.js b/magazine.js
index 388be56..e05df9d 100755
--- a/magazine.js
+++ b/magazine.js
@@ -1346,6 +1346,10 @@ function buildJSON(export_bookmarks, export_position){
 // 		will not get loaded correctly.
 // 		one example is "background: none", use "background: transparent"
 // 		instead.
+// XXX this breaks:
+// 		- captions (???)
+// 		- editor (needs reset)
+// 		- navigator (???)
 function loadJSON(data, load_user_data){
 	function _build(parent, data){
 		// page...
@@ -1419,6 +1423,10 @@ function loadJSON(data, load_user_data){
 	if(load_user_data){
 		loadMagazineUserData(data.position, data.bookmarks)
 	}
+
+	// XXX do this ONLY in editor mode...
+	setupEditor()
+	resetNavigator()
 }