diff --git a/share/functions/__fish_complete_mime.fish b/share/functions/__fish_complete_mime.fish
index 76c4e7165..cd84da1f5 100644
--- a/share/functions/__fish_complete_mime.fish
+++ b/share/functions/__fish_complete_mime.fish
@@ -23,8 +23,5 @@ function __fish_complete_mime -d "Complete using text files"
 		printf "%s\n" $res
 	end
 
-	# Also do directory completion, since there might be files
-	# with the correct suffix in a subdirectory
-	__fish_complete_directories $comp
 end
 
diff --git a/share/functions/__fish_complete_vi.fish b/share/functions/__fish_complete_vi.fish
index 39a71ac38..78167d2ce 100644
--- a/share/functions/__fish_complete_vi.fish
+++ b/share/functions/__fish_complete_vi.fish
@@ -22,7 +22,7 @@ function __fish_complete_vi -d "Compleletions for vi and its aliases"
 		# +{command}    : Execute Ex command after the first file has been read
 
 		# Complete gzip-compressed files
-		complete $cmds -x -a "(__fish_complete_suffix .gz)"
+		complete $cmds -x -a "(__fish_complete_mime 'application/x-gzip')"
 
 		complete $cmds -s c -r --description 'Execute Ex command after the first file has been read'
 		complete $cmds -s S -r --description 'Source file after the first file has been read'