diff --git a/es-core/src/components/OptionListComponent.h b/es-core/src/components/OptionListComponent.h
index 3549eafb4..5a2f4de92 100644
--- a/es-core/src/components/OptionListComponent.h
+++ b/es-core/src/components/OptionListComponent.h
@@ -261,8 +261,7 @@ private:
         }
         else {
             // Make a size update so the text for the first entry is properly aligned.
-            if (mText.getSize().x > 0.0f && mText.getSize().y > 0.0f)
-                setSize(mText.getSize());
+            setSize(mLeftArrow.getSize() + mRightArrow.getSize());
 
             // Display the selected entry and left/right option arrows.
             for (auto it = mEntries.cbegin(); it != mEntries.cend(); it++) {