diff --git a/sass/_controlbox.scss b/sass/_controlbox.scss
index f7d793d11..27a9ae085 100644
--- a/sass/_controlbox.scss
+++ b/sass/_controlbox.scss
@@ -356,8 +356,12 @@
             }
         }
     }
+}
 
+
+#conversejs.converse-overlayed {
     .toggle-controlbox {
+        order: -1;
         text-align: center;
         background-color: var(--link-color);
         border-top-left-radius: var(--button-border-radius);
@@ -371,10 +375,7 @@
             color: var(--inverse-link-color);
         }
     }
-}
 
-
-#conversejs.converse-overlayed {
     #controlbox {
         order: -1;
         min-width: var(--controlbox-width) !important;
@@ -561,7 +562,7 @@
                 font-size: 14px;
             }
 
-            .chatbox { 
+            .chatbox {
                 .box-flyout {
                     margin-left: 15px; // Counteracts Bootstrap margins, but
                                        // not clear why needed...
diff --git a/src/converse-controlbox.js b/src/converse-controlbox.js
index dbdccf832..17f2eba62 100644
--- a/src/converse-controlbox.js
+++ b/src/converse-controlbox.js
@@ -134,18 +134,6 @@ converse.plugins.add('converse-controlbox', {
                 } else {
                     this.__super__.initialize.apply(this, arguments);
                 }
-            },
-        },
-
-        ChatBoxView: {
-            insertIntoDOM () {
-                const view = this.__super__._converse.chatboxviews.get("controlbox");
-                if (view) {
-                    view.el.insertAdjacentElement('afterend', this.el)
-                } else {
-                    this.__super__.insertIntoDOM.apply(this, arguments);
-                }
-                return this;
             }
         }
     },