diff --git a/src/scss/partials/_chatTopbar.scss b/src/scss/partials/_chatTopbar.scss
index e82a47f8..2aafb8d9 100644
--- a/src/scss/partials/_chatTopbar.scss
+++ b/src/scss/partials/_chatTopbar.scss
@@ -12,7 +12,6 @@
 	z-index: 1;
 	min-height: 3.5rem;
 	max-height: 3.5rem;
-	border-left: 1px solid var(--border-color);
 
 	&.is-pinned-floating {
 		&.is-pinned-audio-shown, &.is-pinned-message-shown:not(.hide-pinned) {
@@ -57,10 +56,6 @@
 		}
 	}
 
-	@include respond-to(handhelds) {
-		border-left: none;
-	}
-
 	.sidebar-close-button {
 		position: absolute;
 	}
diff --git a/src/scss/partials/_leftSidebar.scss b/src/scss/partials/_leftSidebar.scss
index 4a055684..280cb927 100644
--- a/src/scss/partials/_leftSidebar.scss
+++ b/src/scss/partials/_leftSidebar.scss
@@ -7,7 +7,7 @@
 #column-left {
   //display: flex;
   flex-direction: column;
-  flex: 1;
+  flex: 1 1 auto;
   min-width: 18rem;
   max-width: calc(#{$large-screen} / 4);
 
@@ -20,6 +20,22 @@
       filter: brightness(80%);
     }
   }
+
+  @include respond-to(not-handhelds) {
+    overflow: visible;
+
+    &:after {
+      position: absolute;
+      content: " ";
+      display: block;
+      height: 100vh;
+      width: 1px;
+      background-color: var(--border-color);
+      right: -1px;
+      top: 0;
+      z-index: 2;
+    }
+  }
   
   @include respond-to(floating-left-sidebar) {
     display: flex;
diff --git a/src/scss/partials/_rightSidebar.scss b/src/scss/partials/_rightSidebar.scss
index d9bb8ea1..d8c18888 100644
--- a/src/scss/partials/_rightSidebar.scss
+++ b/src/scss/partials/_rightSidebar.scss
@@ -24,7 +24,7 @@
     position: absolute;
     right: 0;
     z-index: 3;
-    transform: translate3d(calc(var(--right-column-width) + 1px), 0, 0);
+    transform: translate3d(calc(var(--right-column-width)), 0, 0);
   
     .sidebar-content {
       min-width: var(--right-column-width);
@@ -43,7 +43,7 @@
 			transition: none;
 		}
 
-    &:before {
+    /* &:before {
       position: absolute;
       content: " ";
       display: block;
@@ -52,7 +52,11 @@
       background-color: var(--border-color);
       left: -1px;
       top: 0;
-    }
+    } */
+  }
+
+  @include respond-to(medium-screens) {
+    border-left: 1px solid var(--border-color);
   }
 
   /* @include respond-to(medium-screens) {
diff --git a/src/scss/partials/pages/_chats.scss b/src/scss/partials/pages/_chats.scss
index bc3e4898..350c83e6 100644
--- a/src/scss/partials/pages/_chats.scss
+++ b/src/scss/partials/pages/_chats.scss
@@ -103,9 +103,9 @@
 
   @include respond-to(large-screens) {
     border-top-width: 0;
+    border-right-width: 1px;
     border-bottom-width: 0;
     border-left-width: 1px;
-    border-right-width: 1px;
     border-style: solid;
     border-color: var(--border-color);
   }