diff --git a/static/style/blue/base.css b/static/style/blue/base.css
index 6b0d857e7be..00ec730c9c9 100644
--- a/static/style/blue/base.css
+++ b/static/style/blue/base.css
@@ -2030,8 +2030,8 @@ div.permissionContainer{padding-left:20px}
 .list-panel .controls .list-actions:after{clear:both}
 .list-panel .controls .list-actions:before,.list-panel .controls .list-actions:after{content:" ";display:table;}
 .list-panel .controls .list-actions:after{clear:both}
-.list-panel .controls .list-actions .btn{padding-top:2px;padding-bottom:2px;font-size:90%;z-index:inherit}
-.list-panel .controls .list-actions .list-action-menu{float:right}.list-panel .controls .list-actions .list-action-menu .dropdown-menu{z-index:inherit}
+.list-panel .controls .list-actions .btn{padding-top:2px;padding-bottom:2px;font-size:90%}
+.list-panel .controls .list-actions .list-action-menu{float:right}
 .list-panel .list-items .list-item:not(:last-child){border-bottom-width:0px}
 .list-panel .empty-message{display:none;margin:0px}
 .list-item .details .list-panel{margin-top:8px;border-radius:3px;background:white;padding:4px}.list-item .details .list-panel .list-items{border:1px solid #bfbfbf;border-radius:3px}.list-item .details .list-panel .list-items .list-item:first-child{border-top-width:0px;border-radius:3px 3px 0px 0px}
@@ -2138,9 +2138,10 @@ div.permissionContainer{padding-left:20px}
 .multi-panel-history .control-column.control-column-right{text-align:right}
 .multi-panel-history .outer-middle{overflow:auto}
 .multi-panel-history .middle{min-width:100%;margin:0px 0px 0px 0px;background-color:white;padding:8px}
-.multi-panel-history .history-column{width:312px;margin:0 8px 0 0}.multi-panel-history .history-column:first-child{position:fixed;z-index:2}.multi-panel-history .history-column:first-child .history-panel{border:1px solid black;box-shadow:4px 4px 4px rgba(96,96,96,0.3)}
+.multi-panel-history .history-column{width:312px;margin:0 8px 0 0}.multi-panel-history .history-column:first-child{position:fixed;z-index:10}.multi-panel-history .history-column:first-child .history-panel{border:1px solid black;box-shadow:4px 4px 4px rgba(96,96,96,0.3)}
 .multi-panel-history .history-column:nth-child(2){margin-left:320px}
 .multi-panel-history .history-column:last-child{margin-right:0px}
+.multi-panel-history .history-column .dropdown-menu{z-index:inherit}
 .multi-panel-history .history-column .panel-controls{width:100%;height:24px;border-radius:3px;background-color:white;text-align:center;flex:0 0 auto;-webkit-align-self:auto;-ms-flex-item-align:auto;align-self:auto}.multi-panel-history .history-column .panel-controls .btn{height:20px;line-height:normal;font-size:90%;padding-top:0px;padding-bottom:0px}
 .multi-panel-history .history-column .panel-controls .pull-left .btn{margin-right:4px}
 .multi-panel-history .history-column .panel-controls .pull-right .btn{margin-left:4px}
diff --git a/static/style/src/less/history.less b/static/style/src/less/history.less
index 8e834833fb2..7ef65171c21 100644
--- a/static/style/src/less/history.less
+++ b/static/style/src/less/history.less
@@ -744,7 +744,7 @@
         // current history
         &:first-child {
             position: fixed;
-            z-index : 2;
+            z-index : 10;
 
             // visually differentiate the current history
             .history-panel {
@@ -759,6 +759,9 @@
         &:last-child {
             margin-right: 0px;
         }
+        .dropdown-menu {
+            z-index: inherit;
+        }
 
         .panel-controls {
             width: 100%;
diff --git a/static/style/src/less/list-item.less b/static/style/src/less/list-item.less
index f6dd0a5aedb..a74dde23c38 100644
--- a/static/style/src/less/list-item.less
+++ b/static/style/src/less/list-item.less
@@ -167,13 +167,9 @@
                 padding-top: 2px;
                 padding-bottom: 2px;
                 font-size: 90%;
-                z-index: inherit;
             }
             .list-action-menu {
                 float: right;
-                .dropdown-menu {
-                    z-index: inherit;
-                }
             }
         }
     }