diff --git a/lib/classes/sidebar/SelectListElement.php b/lib/classes/sidebar/SelectListElement.php
index b8aee53f4f5c92942338e7bcab0db96b6071bc00..479961791b5ad9acf20ae9e7a447b272b8fa22f0 100644
--- a/lib/classes/sidebar/SelectListElement.php
+++ b/lib/classes/sidebar/SelectListElement.php
@@ -45,11 +45,14 @@ class SelectListElement extends WidgetElement implements ArrayAccess
                     'value' => $option->getId(),
                     'class' => ($option->isHeader() ? 'nested-item-header' : '') . ($option->getIndentLevel() ? ' nested-item' : ''),
                     'title' => $option->getTooltip() ?: $option->getLabel(),
-                    'selected' => $option->isActive()
+                    'selected' => $option->isActive() || $option->getId() === $this->selected_option
                 ];
                 $option_label = $option->getLabel();
             } else {
-                $option_attr = compact('value');
+                $option_attr = [
+                    'value' => $value,
+                    'selected' => $value == $this->selected_option
+                ];
                 $option_label = $option;
             }