diff --git a/share/functions/__fish_hg_prompt.fish b/share/functions/__fish_hg_prompt.fish
index 3d48bb7fa..efb7c7aaf 100644
--- a/share/functions/__fish_hg_prompt.fish
+++ b/share/functions/__fish_hg_prompt.fish
@@ -37,11 +37,13 @@ function __fish_hg_prompt --description 'Write out the hg prompt'
         return
     end
 
-    set -l bookmark (hg bookmark -q)
-    # Unfortunately, hg bookmark doesn't exit non-zero when there's no bookmark
-    if test -n "$bookmark"
-        set branch "$branch/$bookmark"
-    end
+	# With "-q", hg bookmark will always output every bookmark
+	# So our only option is to filter it ourselves
+	set -l bookmark (hg bookmark | string match ' \\**' | cut -d" " -f3)
+	# Unfortunately, hg bookmark doesn't exit non-zero when there's no bookmark
+	if test -n "$bookmark"
+		set branch "$branch/$bookmark"
+	end
 
     echo -n '|'