diff --git a/installer/bash/filebot_completion b/installer/bash/filebot_completion
index d022b7f0..f0a7d2b8 100644
--- a/installer/bash/filebot_completion
+++ b/installer/bash/filebot_completion
@@ -186,7 +186,8 @@ function _picocli_filebot() {
   if [[ "${CURR_WORD}" == -* ]]; then
     COMPREPLY=( $(compgen -W "${FLAG_OPTS} ${ARG_OPTS}" -- ${CURR_WORD}) )
   else
-    COMPREPLY=( $(compgen -W "${COMMANDS}" -- ${CURR_WORD}) )
+    compopt -o filenames
+    COMPREPLY=( $( compgen -f -- ${CURR_WORD} ) ) # files
   fi
 }
 
diff --git a/source/net/filebot/platform/bash/BashCompletionBuilder.java b/source/net/filebot/platform/bash/BashCompletionBuilder.java
index db4a24c4..bac9449f 100644
--- a/source/net/filebot/platform/bash/BashCompletionBuilder.java
+++ b/source/net/filebot/platform/bash/BashCompletionBuilder.java
@@ -5,7 +5,6 @@ import static net.filebot.WebServices.*;
 import java.io.File;
 import java.lang.reflect.Field;
 import java.nio.charset.Charset;
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -129,7 +128,7 @@ class BashCompletionBuilder {
 	public File license;
 
 	@Parameters
-	public List<String> arguments = new ArrayList<String>();
+	public List<File> arguments;
 
 	private static class DatabaseCompletionCandidates implements Iterable<String> {