diff --git a/public/js/icinga/behavior/actiontable.js b/public/js/icinga/behavior/actiontable.js
index 71ca95051..b3b409491 100644
--- a/public/js/icinga/behavior/actiontable.js
+++ b/public/js/icinga/behavior/actiontable.js
@@ -397,6 +397,13 @@
         $(container).find('.selection-info-count').text(table.selections().size());
     };
 
+    ActionTable.prototype.clearAll = function () {
+        var self = this;
+        this.tables().each(function () {
+            new Selection(this, self.icinga).clear();
+        });
+    };
+
     Icinga.Behaviors.ActionTable = ActionTable;
 
 }) (Icinga, jQuery);
diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 9d4e80b15..3ea40b3d7 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -427,7 +427,6 @@
                             } else {
                                 icinga.ui.layout1col();
                             }
-                            $('table tr[href].active').removeClass('active');
                             icinga.history.pushCurrentState();
                         }
                     }
diff --git a/public/js/icinga/ui.js b/public/js/icinga/ui.js
index d2f9ab138..4ab802ca7 100644
--- a/public/js/icinga/ui.js
+++ b/public/js/icinga/ui.js
@@ -241,6 +241,9 @@
             $('#layout').removeClass('twocols');
             this.closeContainer($('#col2'));
             this.disableCloseButtons();
+
+            // one-column layouts never have any selection active
+            this.icinga.behaviors.actiontable.clearAll();
         },
 
         closeContainer: function($c) {