diff --git a/stylesheets/_global.scss b/stylesheets/_global.scss
index 2488408214..6ac0d2a48d 100644
--- a/stylesheets/_global.scss
+++ b/stylesheets/_global.scss
@@ -82,9 +82,9 @@ textarea {
 
 ::-webkit-scrollbar {
   // For vertical scrollbars
-  width: 9px;
+  width: variables.$scrollbar_width;
   // For horizontal scrollbars
-  height: 9px;
+  height: variables.$scrollbar_height;
 }
 
 ::-webkit-scrollbar-track {
diff --git a/stylesheets/_modules.scss b/stylesheets/_modules.scss
index b2b50ff83c..74aaf257e5 100644
--- a/stylesheets/_modules.scss
+++ b/stylesheets/_modules.scss
@@ -3728,10 +3728,15 @@ button.module-image__border-overlay:focus {
   & {
     @include mixins.light-theme() {
       background: variables.$color-white;
+      ::-webkit-scrollbar-thumb {
+        border-color: variables.$color-white;
+      }
     }
-
-    @include mixins.dark-theme() {
+    @include mixins.dark-theme {
       background: variables.$color-gray-75;
+      ::-webkit-scrollbar-thumb {
+        border-color: variables.$color-gray-75;
+      }
     }
   }
 
diff --git a/stylesheets/_variables.scss b/stylesheets/_variables.scss
index b34a9b83e4..9c043ecdda 100644
--- a/stylesheets/_variables.scss
+++ b/stylesheets/_variables.scss
@@ -318,3 +318,6 @@ $NavTabs__ItemButton__blockPadding: 10px;
 $CallControls__height: 80px;
 $CallControls__max-width: 640px;
 $CallControls__initial-width: 480px;
+
+$scrollbar_height: 9px;
+$scrollbar_width: 9px;
diff --git a/stylesheets/components/CompositionInput.scss b/stylesheets/components/CompositionInput.scss
index 062ac40902..591658e450 100644
--- a/stylesheets/components/CompositionInput.scss
+++ b/stylesheets/components/CompositionInput.scss
@@ -24,6 +24,14 @@
         inset-inline: 0;
         font-style: normal;
       }
+      &::-webkit-scrollbar-thumb {
+        @include mixins.light-theme {
+          border-color: variables.$color-gray-05;
+        }
+        @include mixins.dark-theme {
+          border-color: variables.$color-gray-75;
+        }
+      }
     }
   }
 
@@ -87,10 +95,10 @@
 
       &::-webkit-scrollbar-thumb {
         @include mixins.light-theme {
-          border: 2px solid variables.$color-gray-05;
+          border-color: variables.$color-gray-05;
         }
         @include mixins.dark-theme {
-          border: 2px solid variables.$color-gray-75;
+          border-color: variables.$color-gray-75;
         }
       }
 
@@ -106,6 +114,11 @@
         .DraftEditor-root {
           height: $largeHeightContentBox;
         }
+
+        .ql-editor {
+          margin-inline-end: calc(-1 * variables.$scrollbar_width);
+          padding-inline-end: variables.$scrollbar_width;
+        }
       }
 
       &--link-preview {