diff --git a/CHANGELOG b/CHANGELOG
index cd1a6408c2..e8a9457a68 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
 v3.4.6 (XXXX-XX-XX)
 -------------------
 
+* fixed internal issue #2946: create graph autocomplete was not working under
+  certain circumstances.
+
 * fixed a memory leak in PRUNE operation for traversals.
   The leak occurred only when PRUNE was actively used in queries.
 
@@ -12,6 +15,7 @@ v3.4.6 (XXXX-XX-XX)
 
 * port back timestamp replication in agency from devel
 
+
 v3.4.5 (2019-03-27)
 -------------------
 
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/graphManagementView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/graphManagementView.js
index 3015804945..6b8bdd60dc 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/graphManagementView.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/graphManagementView.js
@@ -42,11 +42,12 @@
       } else {
         $('#modal-dialog .modal-footer .button-success').css('display', 'initial');
       }
+
       if (id === 'smartGraph') {
         this.toggleSmartGraph();
         $('#createGraph').addClass('active');
         this.showSmartGraphOptions();
-      } else {
+      } else if (id === 'createGraph') {
         this.toggleSmartGraph();
         this.hideSmartGraphOptions();
       }
@@ -246,6 +247,10 @@
     },
 
     toggleSmartGraph: function () {
+      if (!frontendConfig.isCluster || !frontendConfig.isEnterprise) {
+        return;
+      }
+
       var i;
       var self = this;