diff --git a/app/soapbox/features/compose/components/compose_form.js b/app/soapbox/features/compose/components/compose_form.js
index d5d1e72b8..11a839f63 100644
--- a/app/soapbox/features/compose/components/compose_form.js
+++ b/app/soapbox/features/compose/components/compose_form.js
@@ -355,28 +355,25 @@ export default class ComposeForm extends ImmutablePureComponent {
           }
         </AutosuggestTextarea>
 
-        {
-          !condensed &&
-          <div className='compose-form__buttons-wrapper'>
-            <div className='compose-form__buttons'>
-              <UploadButtonContainer />
-              <PollButtonContainer />
-              <PrivacyDropdownContainer />
-              <ScheduleButtonContainer />
-              <SpoilerButtonContainer />
-              <MarkdownButtonContainer />
-            </div>
-            {maxTootChars && (
-              <div className='compose-form__counter'>
-                {/* <TextCharacterCounter max={maxTootChars} text={text} /> */}
-                <VisualCharacterCounter max={maxTootChars} text={text} />
-              </div>
-            )}
-            <div className='compose-form__publish'>
-              <div className='compose-form__publish-button-wrapper'><Button text={publishText} onClick={this.handleSubmit} disabled={disabledButton} block /></div>
-            </div>
+        <div className='compose-form__buttons-wrapper'>
+          <div className='compose-form__buttons'>
+            <UploadButtonContainer />
+            <PollButtonContainer />
+            <PrivacyDropdownContainer />
+            <ScheduleButtonContainer />
+            <SpoilerButtonContainer />
+            <MarkdownButtonContainer />
           </div>
-        }
+          {maxTootChars && (
+            <div className='compose-form__counter'>
+              {/* <TextCharacterCounter max={maxTootChars} text={text} /> */}
+              <VisualCharacterCounter max={maxTootChars} text={text} />
+            </div>
+          )}
+          <div className='compose-form__publish'>
+            <div className='compose-form__publish-button-wrapper'><Button text={publishText} onClick={this.handleSubmit} disabled={disabledButton} block /></div>
+          </div>
+        </div>
       </div>
     );
   }
diff --git a/app/styles/components/compose-form.scss b/app/styles/components/compose-form.scss
index 73edf3e30..8c583edff 100644
--- a/app/styles/components/compose-form.scss
+++ b/app/styles/components/compose-form.scss
@@ -89,6 +89,12 @@
       min-height: 46px;
       border-radius: 5px;
     }
+
+    .compose-form__buttons-wrapper {
+      height: 0;
+      padding: 0;
+      overflow: hidden;
+    }
   }
 
   &__modifiers {