diff --git a/internal_packages/composer/lib/composer-header-actions.jsx b/internal_packages/composer/lib/composer-header-actions.jsx
index 13c228906..707c4f5c5 100644
--- a/internal_packages/composer/lib/composer-header-actions.jsx
+++ b/internal_packages/composer/lib/composer-header-actions.jsx
@@ -49,7 +49,6 @@ export default class ComposerHeaderActions extends React.Component {
           className="action show-popout"
           key="popout"
           title="Popout composer…"
-          style={{paddingLeft: "1.5em"}}
           onClick={this._onPopoutComposer}>
           <RetinaImg
             name="composer-popout.png"
diff --git a/internal_packages/composer/stylesheets/composer.less b/internal_packages/composer/stylesheets/composer.less
index bbb35787a..087e87c5c 100644
--- a/internal_packages/composer/stylesheets/composer.less
+++ b/internal_packages/composer/stylesheets/composer.less
@@ -140,7 +140,10 @@ body.platform-win32 {
       color: @text-color-very-subtle;
       img.content-mask { background-color: @text-color-very-subtle; }
       font-size: @font-size-small;
-      padding-left: 1em;
+      padding: 10px 6px;
+      &:last-child {
+        padding-right: 0;
+      }
       &:hover {
         color: @text-color-link;
         img.content-mask { background-color: @text-color-link; }
diff --git a/src/components/key-commands-region.cjsx b/src/components/key-commands-region.cjsx
index a571f333f..c4b9a1aab 100644
--- a/src/components/key-commands-region.cjsx
+++ b/src/components/key-commands-region.cjsx
@@ -126,7 +126,7 @@ class KeyCommandsRegion extends React.Component
       @props.onFocusOut(@_lastFocusElement)
       @setState({focused: false})
       @_losingFocusToElement = null
-    , 100
+    , 150
 
     @_out = (event) =>
       @_lastFocusElement = event.target