diff --git a/src-docs/src/views/nav_drawer/nav_drawer.js b/src-docs/src/views/nav_drawer/nav_drawer.js
index 5d3e12715b9..af13f8a9121 100644
--- a/src-docs/src/views/nav_drawer/nav_drawer.js
+++ b/src-docs/src/views/nav_drawer/nav_drawer.js
@@ -522,8 +522,10 @@ export default class extends Component {
     }, 350);
 
     // Scrolls the menu and flyout back to top when the nav drawer collapses
-    document.getElementById('navDrawerMenu').scroll(0, 0);
-    document.getElementById('navDrawerFlyout').scroll(0, 0);
+    setTimeout(() => {
+      document.getElementById('navDrawerMenu').scrollTop = 0;
+      document.getElementById('navDrawerFlyout').scrollTop = 0;
+    }, 300);
   };
 
   focusOut = () => {
diff --git a/src/components/list_group/_list_group_item.scss b/src/components/list_group/_list_group_item.scss
index c486630d003..0c9f7a5b299 100644
--- a/src/components/list_group/_list_group_item.scss
+++ b/src/components/list_group/_list_group_item.scss
@@ -76,7 +76,7 @@
 .euiListGroupItem__icon {
   flex-grow: 0;
   margin-right: $euiSizeM;
-  min-width: $euiSize;
+  flex-shrink: 0;
 }
 
 .euiListGroupItem--xSmall {
@@ -101,10 +101,6 @@
   .euiListGroupItem__label {
     white-space: initial;
   }
-
-  .euiListGroupItem__icon {
-    min-width: $euiSize;
-  }
 }
 
 // Layout alts from euiListGroup
diff --git a/src/components/nav_drawer/_nav_drawer.scss b/src/components/nav_drawer/_nav_drawer.scss
index 42569243f24..3ab0f007a94 100644
--- a/src/components/nav_drawer/_nav_drawer.scss
+++ b/src/components/nav_drawer/_nav_drawer.scss
@@ -13,6 +13,12 @@
   transition: width $euiAnimSpeedFast $euiAnimSlightResistance;
   transition-delay: $euiNavDrawerContractingDelay;
 
+  &.euiNavDrawer-isCollapsed  {
+    .euiListGroupItem-hasExtraAction .euiListGroupItem__button {
+      max-width: 100%;
+    }
+  }
+
   &.euiNavDrawer-isExpanded {
     width: $euiNavDrawerWidthExpanded;
     transition-delay: $euiNavDrawerExpandingDelay;