diff --git a/contrib/imv-dir b/contrib/imv-dir
index d9fb46f..b50ddcc 100755
--- a/contrib/imv-dir
+++ b/contrib/imv-dir
@@ -1,2 +1,6 @@
-#!/bin/sh
-exec imv -n "$1" "$(dirname "$1")"
+#!/bin/sh -efu
+if [ $# -ge 2 ]; then
+  exec imv "$@"
+else
+  exec imv -n "$1" "$(dirname "$1")"
+fi
diff --git a/files/imv-dir.desktop b/files/imv-dir.desktop
index 5f04f86..85a8b24 100644
--- a/files/imv-dir.desktop
+++ b/files/imv-dir.desktop
@@ -4,7 +4,7 @@ Name[en_US]=imv
 GenericName=Image viewer
 GenericName[en_US]=Image viewer
 Comment=Fast freeimage-based Image Viewer | Open all images in a directory
-Exec=imv-dir %f
+Exec=imv-dir %F
 NoDisplay=true
 Terminal=false
 Type=Application