diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index dd38f30bb..fc2fb8e77 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -89,12 +89,6 @@
             if ($searchField.length && $searchField.val().length) {
                 self.searchValue = $searchField.val();
             }
-
-            if (icinga.ui.isOneColLayout()) {
-                icinga.ui.disableCloseButtons();
-            } else {
-                icinga.ui.enableCloseButtons();
-            }
         },
 
         /**
diff --git a/public/js/icinga/ui.js b/public/js/icinga/ui.js
index a20cd9b37..a797aab1f 100644
--- a/public/js/icinga/ui.js
+++ b/public/js/icinga/ui.js
@@ -269,8 +269,6 @@
             this.icinga.logger.debug('Switching to single col');
             $('#layout').removeClass('twocols');
             this.closeContainer($('#col2'));
-            this.disableCloseButtons();
-
             // one-column layouts never have any selection active
             this.icinga.behaviors.actiontable.clearAll();
         },
@@ -281,6 +279,7 @@
             $c.removeData('lastUpdate');
             $c.removeData('icingaModule');
             this.icinga.loader.stopPendingRequestsFor($c);
+            $c.trigger('close-column');
             $c.html('');
             this.fixControls();
         },
@@ -290,7 +289,6 @@
             this.icinga.logger.debug('Switching to double col');
             $('#layout').addClass('twocols');
             this.fixControls();
-            this.enableCloseButtons();
         },
 
         getAvailableColumnSpace: function () {
@@ -508,14 +506,6 @@
             }
         },
 
-        disableCloseButtons: function () {
-            $('a.close-container-control').hide();
-        },
-
-        enableCloseButtons: function () {
-            $('a.close-close-container-control').show();
-        },
-
         /**
          * Toggle mobile menu
          *