diff --git a/es-core/src/components/OptionListComponent.h b/es-core/src/components/OptionListComponent.h
index 509235ad1..2f7aaf371 100644
--- a/es-core/src/components/OptionListComponent.h
+++ b/es-core/src/components/OptionListComponent.h
@@ -326,7 +326,7 @@ private:
             mText.setText(ss.str());
             mText.setSize(0, mText.getSize().y);
             setSize(mText.getSize().x + mRightArrow.getSize().x +
-                        24.0f * Renderer::getScreenWidthModifier(),
+                        std::round(Font::get(FONT_SIZE_MEDIUM)->getLetterHeight() * 0.68f),
                     mText.getSize().y);
             if (mParent) // Hack since there's no "on child size changed" callback.
                 mParent->onSizeChanged();
@@ -368,7 +368,7 @@ private:
 
                     mText.setSize(0.0f, mText.getSize().y);
                     setSize(mText.getSize().x + mLeftArrow.getSize().x + mRightArrow.getSize().x +
-                                24.0f * Renderer::getScreenWidthModifier(),
+                                std::round(Font::get(FONT_SIZE_MEDIUM)->getLetterHeight() * 0.68f),
                             mText.getSize().y);
                     if (mParent) // Hack since there's no "on child size changed" callback.
                         mParent->onSizeChanged();