diff --git a/Modules/Panels/Settings/Bar/BarWidgetSettingsDialog.qml b/Modules/Panels/Settings/Bar/BarWidgetSettingsDialog.qml
index fc08c19ee..0d445bce5 100644
--- a/Modules/Panels/Settings/Bar/BarWidgetSettingsDialog.qml
+++ b/Modules/Panels/Settings/Bar/BarWidgetSettingsDialog.qml
@@ -186,7 +186,6 @@ Popup {
       }
       settingsLoader.setSource(source, {
                                  "screen": screen,
-                                 "barIsVertical": barIsVertical,
                                  "widgetData": currentWidgetData,
                                  "widgetMetadata": BarWidgetRegistry.widgetMetadata[widgetId]
                                });
diff --git a/Modules/Panels/Settings/Bar/WidgetSettings/CustomButtonSettings.qml b/Modules/Panels/Settings/Bar/WidgetSettings/CustomButtonSettings.qml
index 74e9f0b62..c629c0204 100644
--- a/Modules/Panels/Settings/Bar/WidgetSettings/CustomButtonSettings.qml
+++ b/Modules/Panels/Settings/Bar/WidgetSettings/CustomButtonSettings.qml
@@ -17,8 +17,8 @@ ColumnLayout {
 
   signal settingsChanged(var settings)
 
-  // Bar orientation (per-screen) - passed from parent
-  property bool barIsVertical: false
+  // Bar orientation (per-screen)
+  property bool barIsVertical: (Settings.getBarPositionForScreen(screen?.name) === "left" || Settings.getBarPositionForScreen(screen?.name) === "right")
 
   property string valueIcon: widgetData.icon !== undefined ? widgetData.icon : widgetMetadata.icon
   property string valueIconPosition: widgetData.iconPosition !== undefined ? widgetData.iconPosition : widgetMetadata.iconPosition