diff --git a/browser/src/core/Socket.js b/browser/src/core/Socket.js
index b33321903..f18feb99e 100644
--- a/browser/src/core/Socket.js
+++ b/browser/src/core/Socket.js
@@ -1418,6 +1418,7 @@ app.definitions.Socket = L.Class.extend({
 			this._map.uiManager.closeAll();
 			this._map.setPermission(app.file.permission);
 			window.migrating = false;
+			this._map.uiManager.initializeSidebar();
 		}
 
 		this._map.fire('docloaded', {status: true});
diff --git a/browser/src/map/Map.js b/browser/src/map/Map.js
index 6d6217f47..0ce2b83ce 100644
--- a/browser/src/map/Map.js
+++ b/browser/src/map/Map.js
@@ -295,7 +295,7 @@ L.Map = L.Evented.extend({
 				this.initializeModificationIndicator();
 
 			// Show sidebar.
-			if (this._docLayer) {
+			if (this._docLayer && !this._docLoadedOnce) {
 				// Let the first page finish loading then load the sidebar.
 				setTimeout(this.uiManager.initializeSidebar.bind(this.uiManager), 200);
 			}