diff --git a/share/functions/__fish_print_hostnames.fish b/share/functions/__fish_print_hostnames.fish
index 625b8fa62..4910d3f83 100644
--- a/share/functions/__fish_print_hostnames.fish
+++ b/share/functions/__fish_print_hostnames.fish
@@ -14,9 +14,10 @@ function __fish_print_hostnames -d "Print a list of known hostnames"
 		| string replace -ra '#.*$' '' \
 		| string replace -r '[0-9.]*\s*' '' | string trim | string replace -ra '\s+' '\n'
 	end
+
 	# Print nfs servers from /etc/fstab
 	if test -r /etc/fstab
-		string match -r '^\s*[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3]:|[a-zA-Z\.]*:' </etc/fstab | string replace -r ':.*' ''
+		string match -r '^\s*[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3]:|^[a-zA-Z\.]*:' </etc/fstab | string replace -r ':.*' ''
 	end
 
 	# Print hosts with known ssh keys