diff --git a/src/converse-bookmarks.js b/src/converse-bookmarks.js
index ef47cbf7f..7304b2274 100644
--- a/src/converse-bookmarks.js
+++ b/src/converse-bookmarks.js
@@ -42,7 +42,7 @@
          *
          * NB: These plugins need to have already been loaded via require.js.
          */
-        dependencies: ["converse-chatboxes", "converse-muc"],
+        dependencies: ["converse-chatboxes", "converse-muc", "converse-muc-views"],
 
         overrides: {
             // Overrides mentioned here will be picked up by converse.js's
@@ -269,7 +269,10 @@
 
                 openBookmarkedRoom (bookmark) {
                     if (bookmark.get('autojoin')) {
-                        _converse.api.rooms.create(bookmark.get('jid'), bookmark.get('nick'));
+                        const room = _converse.api.rooms.create(bookmark.get('jid'), bookmark.get('nick'));
+                        if (!room.get('hidden')) {
+                            room.trigger('show');
+                        }
                     }
                     return bookmark;
                 },
@@ -566,6 +569,8 @@
             ]).then(initBookmarks)
               .catch(_.partial(_converse.log, _, Strophe.LogLevel.FATAL));
 
+            _converse.on('reconnected', initBookmarks);
+
             _converse.on('connected', () => {
                 // Add a handler for bookmarks pushed from other connected clients
                 // (from the same user obviously)
@@ -576,13 +581,6 @@
                 }, null, 'message', 'headline', null, _converse.bare_jid);
             });
 
-            const afterReconnection = function () {
-                if (!_converse.allow_bookmarks) {
-                    return;
-                }
-                initBookmarks();
-            };
-            _converse.on('reconnected', afterReconnection);
         }
     });
 }));
diff --git a/src/converse-controlbox.js b/src/converse-controlbox.js
index 8bfca70c5..59505ddf5 100644
--- a/src/converse-controlbox.js
+++ b/src/converse-controlbox.js
@@ -348,13 +348,11 @@
                     this.el.classList.add("col-xl-2");
                     this.el.classList.add("col-md-3");
 
-                    if (!this.controlbox_pane) {
-                        this.controlbox_pane = new _converse.ControlBoxPane();
-                        this.el.querySelector('.controlbox-panes').insertAdjacentElement(
-                            'afterBegin',
-                            this.controlbox_pane.el
-                        )
-                    }
+                    this.controlbox_pane = new _converse.ControlBoxPane();
+                    this.el.querySelector('.controlbox-panes').insertAdjacentElement(
+                        'afterBegin',
+                        this.controlbox_pane.el
+                    )
                 },
 
                 close (ev) {