diff --git a/library/Icinga/Web/Widget/SortBox.php b/library/Icinga/Web/Widget/SortBox.php
index 557469966..42e7110cc 100644
--- a/library/Icinga/Web/Widget/SortBox.php
+++ b/library/Icinga/Web/Widget/SortBox.php
@@ -119,15 +119,15 @@ class SortBox extends AbstractWidget
             'label'         => 'Sort By',
             'multiOptions'  => $this->sortFields,
             'style'         => 'width: 12em',
-            'class'         => 'autosubmit',
+            'autosubmit'    => true
         ));
         $form->addElement('select', 'dir', array(
             'multiOptions'  => array(
                 'asc'       => 'Asc',
                 'desc'      => 'Desc',
             ),
-            'style' => 'width: 5em',
-            'class' => 'autosubmit'
+            'style'         => 'width: 5em',
+            'autosubmit'    => true
         ));
         $sort = $form->getElement('sort')->setDecorators(array('ViewHelper'));
         $dir = $form->getElement('dir')->setDecorators(array('ViewHelper'));
diff --git a/modules/monitoring/library/Monitoring/Web/Widget/TimelineIntervalBox.php b/modules/monitoring/library/Monitoring/Web/Widget/TimelineIntervalBox.php
index 4cab3517d..4d6dbdad5 100644
--- a/modules/monitoring/library/Monitoring/Web/Widget/TimelineIntervalBox.php
+++ b/modules/monitoring/library/Monitoring/Web/Widget/TimelineIntervalBox.php
@@ -84,6 +84,7 @@ class TimelineIntervalBox extends AbstractWidget
         $form = new Form();
         $form->setAttrib('class', 'inline');
         $form->setMethod('GET');
+        $form->setUidDisabled();
         $form->setTokenDisabled();
         $form->setName($this->name);
         $form->addElement(
@@ -92,7 +93,7 @@ class TimelineIntervalBox extends AbstractWidget
             array(
                 'label'         => 'Timeline Interval',
                 'multiOptions'  => $this->values,
-                'class'         => 'autosubmit'
+                'autosubmit'    => true
             )
         );