diff --git a/internal_packages/composer/lib/composer-view.cjsx b/internal_packages/composer/lib/composer-view.cjsx
index bffd42f19..bb1cfbbdc 100644
--- a/internal_packages/composer/lib/composer-view.cjsx
+++ b/internal_packages/composer/lib/composer-view.cjsx
@@ -429,10 +429,10 @@ class ComposerView extends React.Component
 
   _renderActionsRegion: =>
     return <div></div> unless @props.draftClientId
-
-    <InjectedComponentSet className="composer-action-bar-content"
+    <div className="composer-action-bar-content">
+      <InjectedComponentSet className="composer-action-bar-plugins"
                       matching={role: "Composer:ActionButton"}
-                      exposedProps={draftClientId:@props.draftClientId, threadId: @props.threadId}>
+                      exposedProps={draftClientId:@props.draftClientId, threadId: @props.threadId}></InjectedComponentSet>
 
       <button className="btn btn-toolbar btn-trash" style={order: 100}
               title="Delete draft"
@@ -448,7 +448,7 @@ class ComposerView extends React.Component
                         ref="sendActionButton"
                         isValidDraft={@_isValidDraft} />
 
-    </InjectedComponentSet>
+    </div>
 
   isForwardedMessage: =>
     return false if not @_proxy
diff --git a/internal_packages/composer/stylesheets/composer.less b/internal_packages/composer/stylesheets/composer.less
index 205db98eb..fb3ec0b82 100644
--- a/internal_packages/composer/stylesheets/composer.less
+++ b/internal_packages/composer/stylesheets/composer.less
@@ -66,6 +66,7 @@ body.platform-win32 {
       box-shadow: 0 0 0;
       margin: 0;
       padding: 0 9px;
+      white-space: nowrap;
 
       img.content-mask {
         background-color: fadeout(mix(@btn-default-text-color, @component-active-color, 88%), 30%);
@@ -85,6 +86,7 @@ body.platform-win32 {
 
     .btn-send {
       margin-right: 10px;
+      white-space: nowrap;
     }
 
     .composer-action-bar-content {
@@ -93,6 +95,10 @@ body.platform-win32 {
       flex-direction:row;
       max-width: @compose-width;
       padding: 9px 22.5px;
+
+      .composer-action-bar-plugins {
+        flex-wrap: wrap;
+      }
     }
   }
 
diff --git a/static/components/popover.less b/static/components/popover.less
index b23e36322..454ec5e06 100644
--- a/static/components/popover.less
+++ b/static/components/popover.less
@@ -4,6 +4,7 @@
 .popover-container {
   display:inline-block;
   position:relative;
+  white-space: nowrap; // prevent dropdown arrow from wrapping when space constrained
 }
 
 .popover {