diff --git a/pdf-over-gui/src/main/resources/scripts/pdf-over_linux.sh b/pdf-over-gui/src/main/resources/scripts/pdf-over_linux.sh
index 9f8f2776..56c13361 100644
--- a/pdf-over-gui/src/main/resources/scripts/pdf-over_linux.sh
+++ b/pdf-over-gui/src/main/resources/scripts/pdf-over_linux.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
-BASEDIR=`dirname $0`
-GDK_BACKEND=x11,wayland exec $BASEDIR/jre/bin/java -cp "$BASEDIR/lib/*" at.asit.pdfover.gui.Main "$@"
+BASEDIR=$(cd "$(dirname "$0")"; pwd)
+GDK_BACKEND=x11,wayland exec "$BASEDIR/jre/bin/java" -cp "$BASEDIR/lib/*" at.asit.pdfover.gui.Main "$@"
diff --git a/pdf-over-gui/src/main/resources/scripts/pdf-over_mac.sh b/pdf-over-gui/src/main/resources/scripts/pdf-over_mac.sh
index 59a1f73b..6da56788 100644
--- a/pdf-over-gui/src/main/resources/scripts/pdf-over_mac.sh
+++ b/pdf-over-gui/src/main/resources/scripts/pdf-over_mac.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 BASEDIR=$(cd "$(dirname "$0")"; pwd)
 export LC_CTYPE="UTF-8"
-exec $BASEDIR/jre/bin/java -XstartOnFirstThread -cp "$BASEDIR/lib/*" at.asit.pdfover.gui.Main "$@"
+exec "$BASEDIR/jre/bin/java" -XstartOnFirstThread -cp "$BASEDIR/lib/*" at.asit.pdfover.gui.Main "$@"