diff --git a/src/components/CompanionWindow.js b/src/components/CompanionWindow.js
index 2615be8ed46326fffa644f43f205af8f933bb3b3..585009d68f2a16b48366b3dc2c0bf90a8255b5c0 100644
--- a/src/components/CompanionWindow.js
+++ b/src/components/CompanionWindow.js
@@ -35,7 +35,7 @@ export class CompanionWindow extends Component {
         component="aside"
         aria-label={title}
       >
-        <Toolbar variant="dense" className={ns('companion-window-header')}>
+        <Toolbar variant="dense" className={[position === 'left' ? classes.leftPadding : undefined, ns('companion-window-header')].join(' ')} disableGutters>
           <Typography variant="h3" className={classes.windowSideBarTitle}>
             {title}
           </Typography>
diff --git a/src/containers/CompanionWindow.js b/src/containers/CompanionWindow.js
index e2a9615f679cdca7e66489189d21fd19dee07b31..3d7e6724df9b27c38e139c943d1770ec067c1d78 100644
--- a/src/containers/CompanionWindow.js
+++ b/src/containers/CompanionWindow.js
@@ -59,6 +59,10 @@ const styles = theme => ({
   positionButton: {
     order: -100,
   },
+  leftPadding: {
+    ...theme.mixins.gutters(),
+    paddingRight: 0,
+  },
   content: {
     ...theme.mixins.gutters(),
     overflowY: 'auto',