diff --git a/.gitmodules b/.gitmodules
index 5714fa9..76edffc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -44,3 +44,6 @@
 [submodule "tmux/tmux-yank"]
 	path = config/tmux/plugins/tmux-yank
 	url = https://github.com/tmux-plugins/tmux-yank.git
+[submodule "tmux/tmux-window-name"]
+	path = config/tmux/plugins/tmux-window-name
+	url = https://github.com/ofirgall/tmux-window-name.git
diff --git a/add-submodules.sh b/add-submodules.sh
index d6f0afd..ec324a7 100755
--- a/add-submodules.sh
+++ b/add-submodules.sh
@@ -20,5 +20,7 @@ git submodule add --name tmux/tmux-sensible \
   -f https://github.com/tmux-plugins/tmux-sensible.git config/tmux/plugins/tmux-sensible
 git submodule add --name tmux/tmux-sessionist \
   -f https://github.com/tmux-plugins/tmux-sessionist.git config/tmux/plugins/tmux-sessionist
+git submodule add --name tmux/tmux-window-name \
+  -f https://github.com/ofirgall/tmux-window-name.git config/tmux/plugins/tmux-window-name
 git submodule add --name tmux/tmux-yank \
   -f https://github.com/tmux-plugins/tmux-yank.git config/tmux/plugins/tmux-yank
diff --git a/config/tmux/plugins/tmux-window-name b/config/tmux/plugins/tmux-window-name
new file mode 160000
index 0000000..f89e9c9
--- /dev/null
+++ b/config/tmux/plugins/tmux-window-name
@@ -0,0 +1 @@
+Subproject commit f89e9c9d71f5a487e7276ff994cc6f7c1079c8ce
diff --git a/config/tmux/tmux.conf b/config/tmux/tmux.conf
index f7c13f0..a2a9224 100644
--- a/config/tmux/tmux.conf
+++ b/config/tmux/tmux.conf
@@ -94,6 +94,7 @@ set -g @tpm_plugins '            \
   catppuccin/tmux                \
   tmux-plugins/tmux-continuum    \
   jaclu/tmux-menus               \
+  ofirgall/tmux-window-name      \
   tmux-plugins/tmux-resurrect    \
   tmux-plugins/tmux-sensible     \
   tmux-plugins/tmux-sessionist   \
@@ -108,6 +109,13 @@ set -g @tpm_plugins '            \
 ## https://github.com/jaclu/tmux-menus
 set -g @menus_trigger 'm'
 
+##  A plugin to name your tmux windows smartly.
+## https://github.com/ofirgall/tmux-window-name
+### Maximum name length of a window
+set -g @tmux_window_name_max_name_len "20"
+### Replace $HOME with ~ in window names
+set -g @tmux_window_name_use_tilde "True"
+
 ## https://github.com/catppuccin/tmux
 set -g @catppuccin_flavour "mocha" # latte/frappe/macchiato/mocha
 set -g @catppuccin_window_tabs_enabled on # or off to disable window_tabs