diff --git a/README.md b/README.md
index bb80d4e..0ab4941 100644
--- a/README.md
+++ b/README.md
@@ -105,7 +105,7 @@ set -g theme_newline_cursor yes
 **Title options**
 
 - `theme_title_display_process`. By default theme doesn't show current process name in terminal title. If you want to show it, just set to `yes`.
-- `theme_title_display_command`. Use `yes` to show current running command in title (this overrides whatever value `theme_title_display_process` has).
+- `theme_title_display_command`. Use `yes` to show current running command in title or show the path if no command is running (this overrides whatever value `theme_title_display_process` and `theme_title_display_path` have).
 - `theme_title_display_path`. Use `no` to hide current working directory from title.
 - `theme_title_display_user`. Set to `yes` to show the current user in the tab title (unless you're the default user).
 - `theme_title_use_abbreviated_path`. Default is `yes`. This means your home directory will be displayed as `~` and `/usr/local` as `/u/local`. Set it to `no` if you prefer full paths in title.
diff --git a/fish_title.fish b/fish_title.fish
index 1bd794d..2e563a8 100644
--- a/fish_title.fish
+++ b/fish_title.fish
@@ -33,13 +33,9 @@ function fish_title
       and echo ' '
       and __display_path
   else
-      if [ "$theme_title_display_path" != 'no' ]
-        __display_path
-        echo ' '
-      end
-
       if [ $_ != 'fish' ]
         echo $argv[1]
-      end
+      else
+        __display_path
   end
 end