diff --git a/client/app/assets/less/inc/dropdown.less b/client/app/assets/less/inc/dropdown.less
index fe76af9a..51137855 100755
--- a/client/app/assets/less/inc/dropdown.less
+++ b/client/app/assets/less/inc/dropdown.less
@@ -11,6 +11,7 @@
         // The real magic ;)
         > a {
             pointer-events: none;
+            color: @dropdown-link-disabled-color;
         }
     }
 
@@ -29,8 +30,6 @@
 
     &:not([class*="bg-"]) {
         & > li > a {
-            color: #4C4C4C;
-
             &:hover {
                 color: #000;
             }
diff --git a/client/app/pages/queries/query.html b/client/app/pages/queries/query.html
index 32b51284..f85731a3 100644
--- a/client/app/pages/queries/query.html
+++ b/client/app/pages/queries/query.html
@@ -58,7 +58,7 @@
             <span class="zmdi zmdi-more"></span>
           </button>
           <ul class="dropdown-menu pull-right" uib-dropdown-menu>
-            <li><a ng-click="duplicateQuery()" ng-disabled="query.id === undefined || !canForkQuery()"> Fork</a></li>
+            <li ng-class="{'disabled': query.id === undefined || !canForkQuery() }"><a ng-click="duplicateQuery()"> Fork</a></li>
             <li class="divider"></li>
             <li ng-if="!query.is_archived && query.id != undefined && (isQueryOwner || currentUser.hasPermission('admin'))"><a ng-click="archiveQuery()">Archive</a></li>
             <li ng-if="!query.is_archived && query.id != undefined && (isQueryOwner || currentUser.hasPermission('admin')) && showPermissionsControl"><a ng-click="showManagePermissionsModal()">Manage Permissions</a></li>
diff --git a/client/app/pages/queries/view.js b/client/app/pages/queries/view.js
index 52360160..9ac46189 100644
--- a/client/app/pages/queries/view.js
+++ b/client/app/pages/queries/view.js
@@ -145,6 +145,8 @@ function QueryViewCtrl(
 
   $scope.canExecuteQuery = () => currentUser.hasPermission('execute_query') && !$scope.dataSource.view_only;
 
+  $scope.canForkQuery = () => currentUser.hasPermission('edit_query') && !$scope.dataSource.view_only;
+
   $scope.canScheduleQuery = currentUser.hasPermission('schedule_query');
 
   if ($route.current.locals.dataSources) {