diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
index 5a0da48c251..e472cac1b03 100644
--- a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
+++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
@@ -570,7 +570,9 @@ angular.module('zeppelinWebApp')
       });
       */
 
-      // autocomplete on 'ctrl+.'
+      // Auto-complete on 'TAB' key. 
+      // (The 'ctrl+.' shortcut is deprecated but kept for backward compatibility)
+      $scope.editor.commands.bindKey('tab', 'startAutocomplete');
       $scope.editor.commands.bindKey('ctrl-.', 'startAutocomplete');
       $scope.editor.commands.bindKey('ctrl-space', null);