diff --git a/web/gui/src/main/webapp/app/fw/util/keys.js b/web/gui/src/main/webapp/app/fw/util/keys.js
index 1cdb044..d22a335 100644
--- a/web/gui/src/main/webapp/app/fw/util/keys.js
+++ b/web/gui/src/main/webapp/app/fw/util/keys.js
@@ -21,7 +21,7 @@
     'use strict';
 
     // references to injected services
-    var $log, fs, ts, qhs;
+    var $log, fs, ts, ns, qhs;
 
     // internal state
     var enabled = true,
@@ -33,7 +33,7 @@
             viewGestures: []
         };
 
-    // TODO: we need to have the concept of view token here..
+    // TODO: do we still need to have the concept of view token here..?
     function getViewToken() {
         return 'NotYetAViewToken';
     }
@@ -121,7 +121,7 @@
 
     // returns true if we 'consumed' the ESC keypress, false otherwise
     function escapeKey(view, key, code, ev) {
-        return qhs.hideQuickHelp();
+        return ns.hideIfShown() || qhs.hideQuickHelp();
     }
 
     function toggleTheme(view, key, code, ev) {
@@ -168,12 +168,13 @@
 
     angular.module('onosUtil')
     .factory('KeyService',
-        ['$log', 'FnService', 'ThemeService',
+        ['$log', 'FnService', 'ThemeService', 'NavService',
 
-        function (_$log_, _fs_, _ts_) {
+        function (_$log_, _fs_, _ts_, _ns_) {
             $log = _$log_;
             fs = _fs_;
             ts = _ts_;
+            ns = _ns_;
 
             return {
                 bindQhs: function (_qhs_) {