diff --git a/src/app/commands/cmd_options.cpp b/src/app/commands/cmd_options.cpp
index 4f0a2878a..799bb804f 100644
--- a/src/app/commands/cmd_options.cpp
+++ b/src/app/commands/cmd_options.cpp
@@ -696,7 +696,6 @@ public:
 
     onChangeBgScope();
     onChangeGridScope();
-    sectionListbox()->selectIndex(m_curSection);
 
     // Aseprite format preferences
     celFormat()->setSelectedItemIndex(int(m_pref.asepriteFormat.celFormat()));
@@ -1046,6 +1045,9 @@ public:
     return true;
   }
 
+protected:
+  void onOpen(Event& evt) override { sectionListbox()->selectIndex(m_curSection); }
+
 private:
   void onInitTheme(InitThemeEvent& ev) override
   {
diff --git a/src/ui/panel.cpp b/src/ui/panel.cpp
index 7abba02cf..b82746f60 100644
--- a/src/ui/panel.cpp
+++ b/src/ui/panel.cpp
@@ -55,7 +55,7 @@ void Panel::onResize(ResizeEvent& ev)
   // Set all the children to the same "cpos"
   gfx::Rect cpos = childrenBounds();
   for (auto child : children()) {
-    if (!child->isDecorative())
+    if (!child->isDecorative() && child->isVisible())
       child->setBounds(cpos);
   }
 }