diff --git a/app/assets/javascripts/discourse/app/templates/components/composer-toggles.hbs b/app/assets/javascripts/discourse/app/templates/components/composer-toggles.hbs
index a0c91bf1f25..5217b5f74e0 100644
--- a/app/assets/javascripts/discourse/app/templates/components/composer-toggles.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/composer-toggles.hbs
@@ -2,12 +2,12 @@
   <PluginOutlet @name="before-composer-toggles" @tagName="span" @connectorTagName="div" />
 
   {{#if this.site.mobileView}}
-    <DButton @class="btn-flat toggle-toolbar btn-mini-toggle" @icon="bars" @action={{this.toggleToolbar}} @title={{this.toggleToolbarTitle}} @preventFocus={{true}} @tabindex={{-1}} />
+    <DButton @class="btn-flat toggle-toolbar btn-mini-toggle" @icon="bars" @action={{this.toggleToolbar}} @title={{this.toggleToolbarTitle}} @preventFocus={{true}} />
   {{/if}}
 
-  <DButton @class="btn-flat toggler toggle-minimize btn-mini-toggle" @icon={{this.toggleIcon}} @action={{this.toggleComposer}} @title={{this.toggleTitle}} @tabindex={{-1}} />
-
   {{#if this.showFullScreenButton}}
-    <DButton @class="btn-flat toggle-fullscreen btn-mini-toggle" @icon={{this.fullscreenIcon}} @action={{this.toggleFullscreen}} @title={{this.fullscreenTitle}} @tabindex={{-1}} />
+    <DButton @class="btn-flat toggle-fullscreen btn-mini-toggle" @icon={{this.fullscreenIcon}} @action={{this.toggleFullscreen}} @title={{this.fullscreenTitle}} />
   {{/if}}
+
+  <DButton @class="btn-flat toggler toggle-minimize btn-mini-toggle" @icon={{this.toggleIcon}} @action={{this.toggleComposer}} @title={{this.toggleTitle}} />
 </div>
diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index efd401ac173..abbeb0d6606 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -90,9 +90,6 @@ html.composer-open {
     .saving-text {
       display: none;
     }
-    .toggle-minimize {
-      order: 2;
-    }
   }
 
   &.saving .saving-text {
@@ -164,10 +161,6 @@ html.composer-open {
       .d-icon {
         color: var(--primary-medium);
       }
-
-      .toggle-minimize {
-        order: 2;
-      }
     }
   }