Index: src/wp-admin/css/admin-menu.css
===================================================================
--- src/wp-admin/css/admin-menu.css	(revision 49938)
+++ src/wp-admin/css/admin-menu.css	(working copy)
@@ -207,11 +207,6 @@
 	left: 160px;
 	overflow: visible;
 	word-wrap: break-word;
-}
-
-#adminmenu .wp-submenu,
-.folded #adminmenu a.wp-has-current-submenu:focus + .wp-submenu,
-.folded #adminmenu .wp-has-current-submenu .wp-submenu {
 	padding: 7px 0 8px;
 	z-index: 9999;
 	background-color: #32373c;
@@ -239,9 +234,12 @@
 	border: 0 none;
 	margin-top: 0;
 	box-shadow: none;
-	background-color: #32373c;
 }
 
+.folded #adminmenu .wp-has-current-submenu .wp-submenu {
+	box-shadow: 0 3px 5px rgba(0, 0, 0, 0.2);
+}
+
 /* ensure that wp-submenu's box shadow doesn't appear on top of the focused menu item's background. */
 #adminmenu li.menu-top:hover,
 #adminmenu li.opensub > a.menu-top,
@@ -259,8 +257,6 @@
 
 #adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,
 #adminmenu li.current a.menu-top,
-.folded #adminmenu li.wp-has-current-submenu,
-.folded #adminmenu li.current.menu-top,
 #adminmenu .wp-menu-arrow,
 #adminmenu .wp-has-current-submenu .wp-submenu .wp-submenu-head,
 #adminmenu .wp-menu-arrow div {
@@ -438,7 +434,8 @@
 	margin-top: -8px;
 }
 
-.folded ul#adminmenu li:hover a.wp-has-current-submenu:after {
+.folded ul#adminmenu li:hover a.wp-has-current-submenu:after,
+.folded ul#adminmenu li.wp-has-current-submenu:focus-within a.wp-has-current-submenu:after {
 	display: none;
 }
 
@@ -831,7 +828,8 @@
 		display: block;
 	}
 
-	.auto-fold ul#adminmenu li:hover a.wp-has-current-submenu:after {
+	.auto-fold ul#adminmenu li:hover a.wp-has-current-submenu:after,
+	.auto-fold ul#adminmenu li.wp-has-current-submenu:focus-within a.wp-has-current-submenu:after {
 		display: block;
 	}
 
Index: src/wp-admin/css/colors/_admin.scss
===================================================================
--- src/wp-admin/css/colors/_admin.scss	(revision 49938)
+++ src/wp-admin/css/colors/_admin.scss	(working copy)
@@ -286,7 +286,6 @@
 #adminmenu .wp-submenu,
 #adminmenu .wp-has-current-submenu .wp-submenu,
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu,
-.folded #adminmenu .wp-has-current-submenu .wp-submenu,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu {
 	background: $menu-submenu-background;
 }
@@ -301,7 +300,6 @@
 
 #adminmenu .wp-submenu a,
 #adminmenu .wp-has-current-submenu .wp-submenu a,
-.folded #adminmenu .wp-has-current-submenu .wp-submenu a,
 #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a,
 #adminmenu .wp-has-current-submenu.opensub .wp-submenu a {
 	color: $menu-submenu-text;