diff --git a/src/extensionsIntegrated/CustomSnippets/snippetsList.js b/src/extensionsIntegrated/CustomSnippets/snippetsList.js
index b661044cc8..6215842986 100644
--- a/src/extensionsIntegrated/CustomSnippets/snippetsList.js
+++ b/src/extensionsIntegrated/CustomSnippets/snippetsList.js
@@ -78,6 +78,7 @@ define(function (require, exports, module) {
         const $deleteSnippet = $("<div>")
             .html(`<i class="fas fa-trash"></i>`)
             .attr("id", "delete-snippet-btn")
+            .attr("title", Strings.CUSTOM_SNIPPETS_DELETE_TOOLTIP)
             .addClass("delete-snippet-btn");
 
         $snippetItem.append($snippetAbbr, $snippetTemplate, $snippetDescription, $snippetFiles, $deleteSnippet);
diff --git a/src/extensionsIntegrated/DisplayShortcuts/main.js b/src/extensionsIntegrated/DisplayShortcuts/main.js
index 06eae671e2..857ddf79ce 100644
--- a/src/extensionsIntegrated/DisplayShortcuts/main.js
+++ b/src/extensionsIntegrated/DisplayShortcuts/main.js
@@ -124,7 +124,7 @@ define(function (require, exports, module) {
         let q1 = idArray[0].toLowerCase();
         if (defaultCommands.includes(cmdID) || q1 === "file" || q1 === "edit" || q1 === "view" || q1 === "navigate" || q1 === "debug" || q1 === "help" ||
             cmdID.startsWith("AltMenu-") || cmdID.startsWith("codefolding.") || cmdID.startsWith("navigation.") || cmdID.startsWith("recent-files") ||
-            cmdID.startsWith("refactoring.") || cmdID.startsWith("recentProjects") || cmdID ==="showParameterHint") {
+            cmdID.startsWith("refactoring.") || cmdID.startsWith("recentProjects") || cmdID.startsWith("tabbar.") || cmdID ==="showParameterHint") {
             return origBrackets;
         }
         if (idArray.length > 2) {
diff --git a/src/extensionsIntegrated/TabBar/main.js b/src/extensionsIntegrated/TabBar/main.js
index fd6ae9975e..841f578743 100644
--- a/src/extensionsIntegrated/TabBar/main.js
+++ b/src/extensionsIntegrated/TabBar/main.js
@@ -28,6 +28,7 @@ define(function (require, exports, module) {
     const FileUtils = require("file/FileUtils");
     const CommandManager = require("command/CommandManager");
     const Commands = require("command/Commands");
+    const KeyBindingManager = require("command/KeyBindingManager");
     const DocumentManager = require("document/DocumentManager");
     const WorkspaceManager = require("view/WorkspaceManager");
     const Menus = require("command/Menus");
@@ -515,6 +516,23 @@ define(function (require, exports, module) {
             }
         });
 
+        // add listener for tab close button to show the tooltip along with the keybinding
+        $(document).on("mouseenter", ".phoenix-tab-bar .tab-close", function () {
+
+            // there can be more than 1 keybinding for 'Close' as one is default and other one is user-set
+            // we need to get the user created keybinding...
+            const closeBindings = KeyBindingManager.getKeyBindings(Commands.FILE_CLOSE);
+            const closeShortcut = closeBindings.length > 0
+                ? KeyBindingManager.formatKeyDescriptor(closeBindings[closeBindings.length - 1].displayKey)
+                : "";
+
+            const closeTabTooltip = closeShortcut
+                ? `${Strings.CLOSE_TAB_TOOLTIP} (${closeShortcut})`
+                : Strings.CLOSE_TAB_TOOLTIP;
+
+            $(this).attr("title", closeTabTooltip);
+        });
+
         // open tab on mousedown event
         $(document).on("mousedown", ".phoenix-tab-bar .tab", function (event) {
             if ($(event.target).hasClass("fa-times") || $(event.target).closest(".tab-close").length) {
diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js
index af248d8e6d..c9297b626a 100644
--- a/src/nls/root/strings.js
+++ b/src/nls/root/strings.js
@@ -393,7 +393,7 @@ define({
     "CMD_SPLITVIEW_VERTICAL": "Vertical Split",
     "CMD_SPLITVIEW_HORIZONTAL": "Horizontal Split",
     "SPLITVIEW_MENU_TOOLTIP": "Split the editor vertically or horizontally",
-    "GEAR_MENU_TOOLTIP": "Configure Working Set",
+    "GEAR_MENU_TOOLTIP": "Configure Working Files",
 
     "CMD_TOGGLE_SHOW_WORKING_SET": "Show Working Files",
     "CMD_TOGGLE_SHOW_FILE_TABS": "Show File Tab Bar",
@@ -501,6 +501,7 @@ define({
     "CLOSE_TABS_TO_THE_LEFT": "Close Tabs to the Left",
     "CLOSE_ALL_TABS": "Close All Tabs",
     "CLOSE_SAVED_TABS": "Close Saved Tabs",
+    "CLOSE_TAB_TOOLTIP": "Close Tab",
 
     // CodeInspection: errors/warnings
     "ERRORS_NO_FILE": "No File Open",
@@ -1713,6 +1714,7 @@ define({
     "CUSTOM_SNIPPETS_HEADER_TEMPLATE": "Template Text",
     "CUSTOM_SNIPPETS_HEADER_DESCRIPTION": "Description",
     "CUSTOM_SNIPPETS_HEADER_FILE_EXTENSION": "File Extension",
+    "CUSTOM_SNIPPETS_DELETE_TOOLTIP": "Delete Snippet",
 
     // promos
     "PROMO_UPGRADE_TITLE": "You’ve been upgraded to {0}",