diff --git a/share/completions/qmk.fish b/share/completions/qmk.fish
new file mode 100644
index 000000000..57b046631
--- /dev/null
+++ b/share/completions/qmk.fish
@@ -0,0 +1,12 @@
+function __fish_qmk_complete
+  set -lx _ARGCOMPLETE 1
+  set -lx _ARGCOMPLETE_IFS \n
+  set -lx _ARGCOMPLETE_SUPPRESS_SPACE 1
+  set -lx _ARGCOMPLETE_SHELL fish
+  set -lx COMP_LINE (commandline -pc)
+  set -lx COMP_POINT (string length (commandline -cp))
+  set -lx COMP_TYPE
+  qmk 8>&1 9>&2 2>/dev/null
+end
+
+complete -c qmk -f -a '(__fish_qmk_complete)'