diff --git a/es-core/src/components/MenuComponent.h b/es-core/src/components/MenuComponent.h
index c9c1dc1ba..2604ca837 100644
--- a/es-core/src/components/MenuComponent.h
+++ b/es-core/src/components/MenuComponent.h
@@ -39,10 +39,11 @@ public:
 
     void setNeedsSaving() { mNeedsSaving = true; }
 
-    void addRow(const ComponentListRow& row, bool setCursorHere = false)
+    void addRow(const ComponentListRow& row, bool setCursorHere = false, bool updateRowSize = true)
     {
         mList->addRow(row, setCursorHere);
-        updateSize();
+        if (updateRowSize)
+            updateSize();
     }
 
     void addWithLabel(const std::string& label,
diff --git a/es-core/src/components/OptionListComponent.h b/es-core/src/components/OptionListComponent.h
index 84fdf9236..25df35e61 100644
--- a/es-core/src/components/OptionListComponent.h
+++ b/es-core/src/components/OptionListComponent.h
@@ -409,7 +409,7 @@ private:
                 }
 
                 // Also set cursor to this row if we're not multi-select and this row is selected.
-                mMenu.addRow(row, (!mParent->mMultiSelect && it->selected));
+                mMenu.addRow(row, (!mParent->mMultiSelect && it->selected), false);
             }
 
             mMenu.addButton("BACK", "back", [this] { delete this; });