diff --git a/public/css/icinga/controls.less b/public/css/icinga/controls.less
index a4582a56d..b57293b17 100644
--- a/public/css/icinga/controls.less
+++ b/public/css/icinga/controls.less
@@ -1,5 +1,14 @@
 /*! Icinga Web 2 | (c) 2015 Icinga Development Team | GPLv2+ */
 
+.filter {
+  clear: both;
+}
+
+.limiter-control,
+.sort-control {
+  display: inline-block;
+}
+
 .limiter-control > .control-group {
   padding: 0;
 
@@ -19,6 +28,9 @@
 }
 
 .pagination-control {
+  clear: both;
+  float: left;
+
   li {
     &.active {
       > a,
@@ -78,6 +90,11 @@
   }
 }
 
+.sort-controls-container {
+  clear: right;
+  float: right;
+}
+
 html.no-js .sort-control form {
   display: table;
   margin-left: auto;
diff --git a/public/css/icinga/main.less b/public/css/icinga/main.less
index 61373e772..402c76f05 100644
--- a/public/css/icinga/main.less
+++ b/public/css/icinga/main.less
@@ -177,10 +177,8 @@ a:hover > .icon-cancel {
   width: @name-value-table-name-width;
 }
 
-// TODO(el): Fix
 .controls {
   .limiter-control {
-    float: right;
     padding: @vertical-padding / 2 0;
     margin-bottom: 0.25em;
   }
@@ -191,7 +189,6 @@ a:hover > .icon-cancel {
   }
 
   .sort-control {
-    float: right;
     padding: @vertical-padding / 2 0;
     margin-bottom: 0.25em;
     margin-left: 0.5em;