diff --git a/webapp/src/components/sidebar/sidebar.scss b/webapp/src/components/sidebar/sidebar.scss
index f552bbe41..3785e8acc 100644
--- a/webapp/src/components/sidebar/sidebar.scss
+++ b/webapp/src/components/sidebar/sidebar.scss
@@ -1,13 +1,13 @@
 .Sidebar {
     flex: 0 0 240px;
-
+    max-width: 240px;
     display: flex;
     flex-direction: column;
 
     min-height: 100%;
     color: rgb(var(--sidebar-text-rgb));
     background-color: rgb(var(--sidebar-bg-rgb));
-    padding: 12px 0;
+    padding: 24px 0 12px;
 
     &.hidden {
         position: absolute;
@@ -56,9 +56,7 @@
     .WorkspaceTitle {
         display: flex;
         flex-direction: row;
-
         padding: 0 16px;
-        margin-bottom: 12px;
         font-weight: 600;
     }
 
diff --git a/webapp/src/components/workspaceSwitcher/workspaceOptions.scss b/webapp/src/components/workspaceSwitcher/workspaceOptions.scss
index 3a482243c..140bc9984 100644
--- a/webapp/src/components/workspaceSwitcher/workspaceOptions.scss
+++ b/webapp/src/components/workspaceSwitcher/workspaceOptions.scss
@@ -19,6 +19,9 @@
     .workspaceTitle {
         color: rgb(var(--center-channel-color-rgb));
         font-size: 14px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
     }
 
     .boardCount {
diff --git a/webapp/src/components/workspaceSwitcher/workspaceSwitcher.scss b/webapp/src/components/workspaceSwitcher/workspaceSwitcher.scss
index 72b498a4c..a3180c488 100644
--- a/webapp/src/components/workspaceSwitcher/workspaceSwitcher.scss
+++ b/webapp/src/components/workspaceSwitcher/workspaceSwitcher.scss
@@ -7,8 +7,8 @@
     gap: 4px;
     width: 100%;
     position: relative;
-    padding: 12px 16px 0;
-    margin-bottom: 12px;
+    padding: 0 16px;
+    margin-bottom: 16px;
     font-weight: 600;
 
     > div:nth-child(2) {
@@ -30,6 +30,13 @@
     border-radius: 8px;
     padding: 10px 16px;
     cursor: pointer;
+    white-space: nowrap;
+
+    span {
+        max-width: 90%;
+        overflow: hidden;
+        text-overflow: ellipsis;
+    }
 
     .icon-chevron-down {
         margin-left: auto;