diff --git a/application/controllers/EventRulesController.php b/application/controllers/EventRulesController.php
index 8e1a0e6d7..e3a2b8875 100644
--- a/application/controllers/EventRulesController.php
+++ b/application/controllers/EventRulesController.php
@@ -14,7 +14,9 @@
 use Icinga\Web\Notification;
 use Icinga\Web\Session;
 use ipl\Html\Html;
+use ipl\Html\ValidHtml;
 use ipl\Stdlib\Filter;
+use ipl\Web\Common\BaseItemList;
 use ipl\Web\Compat\CompatController;
 use ipl\Web\Compat\SearchControls;
 use ipl\Web\Control\LimitControl;
@@ -88,7 +90,7 @@ public function indexAction(): void
                 Url::fromPath('notifications/event-rule/edit', ['id' => -1, 'clearCache' => true]),
                 'plus'
             ))->openInModal()
-            ->addAttributes(['class' => 'new-event-rule'])
+            ->addAttributes(['class' => 'add-new-component'])
         );
 
         $this->addContent(new EventRuleList($eventRules));
@@ -168,6 +170,22 @@ public function addAction(): void
         $this->addContent($eventRuleConfig);
     }
 
+    /**
+     * Add attribute 'class' => 'full-width' if the content is an instance of BaseItemList
+     *
+     * @param ValidHtml $content
+     *
+     * @return EventRulesController
+     */
+    protected function addContent(ValidHtml $content)
+    {
+        if ($content instanceof BaseItemList) {
+            $this->content->getAttributes()->add('class', 'full-width');
+        }
+
+        return parent::addContent($content);
+    }
+
     public function completeAction(): void
     {
         $suggestions = new ObjectSuggestions();
diff --git a/application/controllers/SchedulesController.php b/application/controllers/SchedulesController.php
index fa5ff70e0..75bfbb2d8 100644
--- a/application/controllers/SchedulesController.php
+++ b/application/controllers/SchedulesController.php
@@ -9,7 +9,9 @@
 use Icinga\Module\Notifications\Model\Schedule;
 use Icinga\Module\Notifications\Web\Control\SearchBar\ObjectSuggestions;
 use Icinga\Module\Notifications\Widget\ItemList\ScheduleList;
+use ipl\Html\ValidHtml;
 use ipl\Stdlib\Filter;
+use ipl\Web\Common\BaseItemList;
 use ipl\Web\Compat\CompatController;
 use ipl\Web\Compat\SearchControls;
 use ipl\Web\Control\LimitControl;
@@ -68,7 +70,7 @@ public function indexAction(): void
                 Links::scheduleAdd(),
                 'plus',
                 [
-                    'class' => 'add-schedule-control'
+                    'class' => 'add-new-component'
                 ]
             ))->openInModal()
         );
@@ -82,6 +84,22 @@ public function indexAction(): void
         $this->getTabs()->activate('schedules');
     }
 
+    /**
+     * Add attribute 'class' => 'full-width' if the content is an instance of BaseItemList
+     *
+     * @param ValidHtml $content
+     *
+     * @return SchedulesController
+     */
+    protected function addContent(ValidHtml $content)
+    {
+        if ($content instanceof BaseItemList) {
+            $this->content->getAttributes()->add('class', 'full-width');
+        }
+
+        return parent::addContent($content);
+    }
+
     public function completeAction(): void
     {
         $suggestions = new ObjectSuggestions();