diff --git a/x-pack/plugins/spaces/public/views/nav_control/components/spaces_menu.js b/x-pack/plugins/spaces/public/views/nav_control/components/spaces_menu.js
index 11db89923d92b..4ba7b83620124 100644
--- a/x-pack/plugins/spaces/public/views/nav_control/components/spaces_menu.js
+++ b/x-pack/plugins/spaces/public/views/nav_control/components/spaces_menu.js
@@ -11,7 +11,6 @@ import {
   EuiContextMenuItem,
   EuiFieldSearch,
   EuiButton,
-  EuiSpacer,
   EuiText,
 } from '@elastic/eui';
 import { SpaceAvatar } from '../../components/space_avatar';
@@ -41,9 +40,7 @@ export class SpacesMenu extends Component {
       return (
         <EuiContextMenuPanel {...panelProps}>
           {this.renderSearchField()}
-          <EuiSpacer />
           {this.renderSpacesListPanel(items, searchTerm)}
-          <EuiSpacer />
           {this.renderManageButton()}
         </EuiContextMenuPanel>
       );
@@ -99,15 +96,16 @@ export class SpacesMenu extends Component {
 
   renderSearchField = () => {
     return (
-      <EuiFieldSearch
-        className="spacesMenu__searchField"
-        placeholder="Find a space"
-        incremental={true}
-        onSearch={this.onSearch}
-        onKeyDown={this.onSearchKeyDown}
-        onFocus={this.onSearchFocus}
-        compressed
-      />
+      <div className="spacesMenu__searchFieldWrapper">
+        <EuiFieldSearch
+          placeholder="Find a space"
+          incremental={true}
+          onSearch={this.onSearch}
+          onKeyDown={this.onSearchKeyDown}
+          onFocus={this.onSearchFocus}
+          compressed
+        />
+      </div>
     );
   }
 
@@ -135,7 +133,9 @@ export class SpacesMenu extends Component {
 
   renderManageButton = () => {
     return (
-      <EuiButton key="manageSpacesButton" size="s" style={{ width: `100%` }}>Manage spaces</EuiButton>
+      <div className="spacesMenu__manageButtonWrapper">
+        <EuiButton key="manageSpacesButton" size="s" style={{ width: `100%` }}>Manage spaces</EuiButton>
+      </div>
     );
   }
 
diff --git a/x-pack/plugins/spaces/public/views/nav_control/components/spaces_menu.less b/x-pack/plugins/spaces/public/views/nav_control/components/spaces_menu.less
index 3090613a0a86e..4ae51c954b00a 100644
--- a/x-pack/plugins/spaces/public/views/nav_control/components/spaces_menu.less
+++ b/x-pack/plugins/spaces/public/views/nav_control/components/spaces_menu.less
@@ -2,3 +2,8 @@
   max-height: 320px;
   overflow-y: auto;
 }
+
+.spacesMenu__searchFieldWrapper,
+.spacesMenu__manageButtonWrapper {
+  padding: 12px;
+}
diff --git a/x-pack/plugins/spaces/public/views/nav_control/nav_control_popover.js b/x-pack/plugins/spaces/public/views/nav_control/nav_control_popover.js
index 7bcd7c83b09c6..f15d1df0bb190 100644
--- a/x-pack/plugins/spaces/public/views/nav_control/nav_control_popover.js
+++ b/x-pack/plugins/spaces/public/views/nav_control/nav_control_popover.js
@@ -68,7 +68,7 @@ export class NavControlPopover extends Component {
         isOpen={this.state.isOpen}
         closePopover={this.closePortal}
         anchorPosition={'rightCenter'}
-        panelPaddingSize="s"
+        panelPaddingSize="none"
         ownFocus
       >
         <SpacesMenu spaces={this.state.spaces} onSelectSpace={this.onSelectSpace} />