diff --git a/client/app/pages/queries/query.html b/client/app/pages/queries/query.html
index daafaf3ad5..99e9f92e12 100644
--- a/client/app/pages/queries/query.html
+++ b/client/app/pages/queries/query.html
@@ -45,7 +45,7 @@ <h3>
           </a>
         </span>
 
-        <div ng-if="query.id != undefined" class="btn-group" role="group" uib-dropdown>
+        <div ng-show="moreMenuIsPopulated()" id="query-more-menu" ng-if="query.id != undefined" class="btn-group" role="group" uib-dropdown>
           <button class="btn btn-default dropdown-toggle" uib-dropdown-toggle>
             <span class="zmdi zmdi-more"></span>
           </button>
diff --git a/client/app/pages/queries/view.js b/client/app/pages/queries/view.js
index b724906612..34e010f572 100644
--- a/client/app/pages/queries/view.js
+++ b/client/app/pages/queries/view.js
@@ -499,6 +499,17 @@ function QueryViewCtrl(
       },
     });
   };
+
+  $scope.moreMenuIsPopulated = () => {
+    const menuParent = document.getElementById('query-more-menu');
+
+    if (menuParent) {
+      if (menuParent.querySelectorAll('.dropdown-menu li').length) {
+        return true;
+      }
+    }
+    return false;
+  };
 }
 
 export default function init(ngModule) {