diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 491a33ef3a..370b8f5d04 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -11,14 +11,14 @@
 use Icinga\Forms\Config\ResourceConfigForm;
 use Icinga\Forms\ConfirmRemovalForm;
 use Icinga\Security\SecurityException;
-use Icinga\Web\Controller\ActionController;
+use Icinga\Web\Controller;
 use Icinga\Web\Notification;
 use Icinga\Web\Widget;
 
 /**
  * Application and module configuration
  */
-class ConfigController extends ActionController
+class ConfigController extends Controller
 {
     /**
      * The first allowed config action according to the user's permissions
@@ -130,6 +130,14 @@ public function modulesAction()
             ->order('enabled', 'desc')
             ->order('name')
             ->paginate();
+        $this->setupLimitControl();
+        $this->setupPaginationControl($this->view->modules);
+        // TODO: Not working
+        /*$this->setupSortControl(array(
+            'name'      => $this->translate('Modulename'),
+            'path'      => $this->translate('Installation Path'),
+            'enabled'   => $this->translate('State')
+        ));*/
     }
 
     public function moduleAction()
diff --git a/application/views/scripts/config/modules.phtml b/application/views/scripts/config/modules.phtml
index 9121de4050..2abf16fc63 100644
--- a/application/views/scripts/config/modules.phtml
+++ b/application/views/scripts/config/modules.phtml
@@ -1,8 +1,12 @@
+<?php if (! $this->compact): ?>
 <div class="controls">
-<?= $this->tabs ?>
-<?= $this->paginationControl($modules) ?>
+  <?= $this->tabs; ?>
+  <?= $this->sortBox; ?>
+  <?= $this->limiter; ?>
+  <?= $this->paginator; ?>
+  <?= $this->filterEditor; ?>
 </div>
-
+<?php endif ?>
 <div class="content">
   <table class="action" data-base-target="_next">
     <tbody>