diff --git a/share/completions/unrar.fish b/share/completions/unrar.fish
index 2619ca279..41d85cc73 100644
--- a/share/completions/unrar.fish
+++ b/share/completions/unrar.fish
@@ -1,5 +1,21 @@
+function __fish_complete_unrar -d "Peek inside of archives and list all files"
+    set -l cmd (commandline -poc)
+    set -e cmd[1]
+    for i in $cmd
+        switch $i
+            case '-*'
+                continue
+
+            case '*.rar'
+                if test -f $i
+                    set -l file_list (unrar vb $i)
+                    printf (_ "%s\tArchived file\n") $file_list
+                end
+                return
+        end
+    end
+end
 
-# Peek inside of archives and list all files
 complete -c unrar -a "(__fish_complete_unrar)"
 
 complete -x -c unrar -n '__fish_use_subcommand' -a e -d "Extract files to current directory"
diff --git a/share/functions/__fish_complete_unrar.fish b/share/functions/__fish_complete_unrar.fish
deleted file mode 100644
index c5cbc7ad9..000000000
--- a/share/functions/__fish_complete_unrar.fish
+++ /dev/null
@@ -1,21 +0,0 @@
-
-function __fish_complete_unrar -d "Peek inside of archives and list all files"
-
-    set -l cmd (commandline -poc)
-    set -e cmd[1]
-    for i in $cmd
-        switch $i
-            case '-*'
-                continue
-
-            case '*.rar'
-                if test -f $i
-                    set -l file_list (unrar vb $i)
-                    printf (_ "%s\tArchived file\n") $file_list
-                end
-                return
-        end
-    end
-end
-
-