-# ?: "Command-W" # Close the frontmost window
-\bind "C-w" "buffer-close" # should be "window-close"
-# +: "Shift-Command-W" # Close a file and its associated windows
-\bind "C-S-w" "buffer-close"
+# +: "Command-W" # Close the frontmost window - modern applications map this to close tab or window if it's the last one
+\bind "C-w" "buffer-close"
+# +: "Shift-Command-W" # Close a file and its associated windows - modern applications map this close window
+\bind "C-S-w" "window-close"