diff --git a/webapp/channels/src/components/advanced_text_editor/advanced_text_editor.scss b/webapp/channels/src/components/advanced_text_editor/advanced_text_editor.scss
index be91833bbf..1be377c432 100644
--- a/webapp/channels/src/components/advanced_text_editor/advanced_text_editor.scss
+++ b/webapp/channels/src/components/advanced_text_editor/advanced_text_editor.scss
@@ -18,10 +18,22 @@
 
     .sidebar--right & {
         padding-top: 12px;
+
+        .AutoHeight {
+            position: absolute;
+            bottom: 0;
+            left: 0;
+        }
     }
 
     .ThreadViewer & {
         padding-top: 12px;
+
+        .AutoHeight {
+            position: absolute;
+            bottom: 0;
+            left: 0;
+        }
     }
 
     .custom-textarea {
diff --git a/webapp/channels/src/components/advanced_text_editor/advanced_text_editor.tsx b/webapp/channels/src/components/advanced_text_editor/advanced_text_editor.tsx
index d080b50a0e..6f0346a7bb 100644
--- a/webapp/channels/src/components/advanced_text_editor/advanced_text_editor.tsx
+++ b/webapp/channels/src/components/advanced_text_editor/advanced_text_editor.tsx
@@ -719,7 +719,7 @@ const AdvanceTextEditor = ({
                                 {showFormatJSX}
                             </TexteditorActions>
                         )}
-                        {showFormattingSpacer || shouldShowPreview || attachmentPreview ? (
+                        {showFormattingSpacer || shouldShowPreview || attachmentPreview || isRHS ? (
                             <FormattingBarSpacer>
                                 {formattingBar}
                             </FormattingBarSpacer>
diff --git a/webapp/channels/src/sass/components/_post-right.scss b/webapp/channels/src/sass/components/_post-right.scss
index 8c4326297b..98c3df0724 100644
--- a/webapp/channels/src/sass/components/_post-right.scss
+++ b/webapp/channels/src/sass/components/_post-right.scss
@@ -179,7 +179,7 @@
         }
 
         .custom-textarea {
-            min-height: 100px;
+            min-height: 46px;
             max-height: calc(50vh - 80px);
         }
 
diff --git a/webapp/channels/src/sass/components/_post.scss b/webapp/channels/src/sass/components/_post.scss
index 6e1f969cca..b802c90643 100644
--- a/webapp/channels/src/sass/components/_post.scss
+++ b/webapp/channels/src/sass/components/_post.scss
@@ -395,7 +395,6 @@
         resize: none;
         scrollbar-color: var(--center-channel-color-32) #fff0;
         scrollbar-width: thin;
-        transition: height 150ms ease-in-out;
 
         &.textbox-preview-area {
             overflow-y: auto;