diff --git a/jadx-gui/src/main/java/jadx/gui/ui/TabbedPane.java b/jadx-gui/src/main/java/jadx/gui/ui/TabbedPane.java
index bbdd40cd493f5dd8fceef298fe30879e4bd97239..2593b2148ad69bc78b8a02648d1ea7a354f1e1f2 100644
--- a/jadx-gui/src/main/java/jadx/gui/ui/TabbedPane.java
+++ b/jadx-gui/src/main/java/jadx/gui/ui/TabbedPane.java
@@ -73,6 +73,7 @@ public class TabbedPane extends JTabbedPane {
 			}
 		});
 		interceptTabKey();
+		interceptCloseKey();
 		enableSwitchingTabs();
 	}
 
@@ -120,6 +121,34 @@ public class TabbedPane extends JTabbedPane {
 		});
 	}
 
+	private void interceptCloseKey() {
+		KeyboardFocusManager.getCurrentKeyboardFocusManager().addKeyEventDispatcher(new KeyEventDispatcher() {
+			private static final int closeKey = KeyEvent.VK_W;
+			private boolean canClose = true;
+
+			@Override
+			public boolean dispatchKeyEvent(KeyEvent e) {
+				if (!FocusManager.isActive()) {
+					return false; // do nothing when tab is not on focus.
+				}
+				if (e.getKeyCode() != closeKey) {
+					return false; // only intercept the events of the close key
+				}
+				if (e.getID() == KeyEvent.KEY_RELEASED) {
+					canClose = true; // after the close key is lifted we allow to use it again
+					return false;
+				}
+				if (e.isControlDown() && canClose) {
+					// close the current tab
+					closeCodePanel(curTab);
+					canClose = false; // make sure we dont close more tabs until the close key is lifted
+					return true;
+				}
+				return false;
+			}
+		});
+	}
+
 	private void enableSwitchingTabs() {
 		addChangeListener(e -> {
 			ContentPanel tab = getSelectedCodePanel();