diff --git a/Modules/TopBar/WorkspaceSwitcher.qml b/Modules/TopBar/WorkspaceSwitcher.qml
index 9ee72845..152b43aa 100644
--- a/Modules/TopBar/WorkspaceSwitcher.qml
+++ b/Modules/TopBar/WorkspaceSwitcher.qml
@@ -164,12 +164,9 @@ Rectangle {
         return 1
     }
 
-    readonly property real horizontalPadding: SettingsData.topBarNoBackground ? 2 : Math.max(Theme.spacingS, SettingsData.topBarInnerPadding)
+    readonly property real padding: (widgetHeight - workspaceRow.implicitHeight) / 2
     
-    width: SettingsData.showWorkspacePadding ? Math.max(
-                                                   120,
-                                                   workspaceRow.implicitWidth + horizontalPadding * 2) : workspaceRow.implicitWidth
-                                               + horizontalPadding * 2
+    width: workspaceRow.implicitWidth + padding * 2
     height: widgetHeight
     radius: SettingsData.topBarNoBackground ? 0 : Theme.cornerRadius
     color: {