diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 91558b9..356a0c3 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -88,6 +88,7 @@ set autochdir
 set autoread        "Reload files changed outside vim
 set nofoldenable    " disable folding
 set title
+set titlestring=%F%m\ %r\ %y
 
 " Wordwrap
 " set formatoptions=l
diff --git a/.tmux.conf b/.tmux.conf
index cfeb485..0ca52f6 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -61,8 +61,8 @@ setw -g window-status-separator ""
 set -g status-style "bg=#3e3e3e,fg=#c0c0c0"
 set -g status-left-length 0
 set -g status-right-length 0
-set -g status-left '#[bg=#263238,fg=#707070] #W#[fg=#212121]▕#[bg=#3e3e3e,fg=#a0a0a0] #{=|145|…:pane_current_path}'
-set -g status-right '#[fg=#f7f7f7]#{@starship}#[fg=#212121]▕#[fg=#f7f7f7]#(~/go/bin/gitmux -cfg ~/.config/gitmux/gitmux.yaml "#{pane_current_path}")#[bg=#263238,fg=#707070] #(date +%%H:%%M) '
+set -g status-left '#{?#{==:#W,1},  #T,#[bg=#263238,fg=#707070] #W#[fg=#212121]▕#[bg=#3e3e3e,fg=#a0a0a0] #{=|145|…:pane_current_path}}'
+set -g status-right '#{?#{==:#W,1},,#[fg=#f7f7f7]#{@starship}#[fg=#212121]▕#[fg=#f7f7f7]#(~/go/bin/gitmux -cfg ~/.config/gitmux/gitmux.yaml "#{pane_current_path}")}#[bg=#263238,fg=#707070] #(date +%%H:%%M) '
 
 set -g set-titles on
 set -g set-titles-string "#H - #T"