diff --git a/env-builder-data/build/script/packet/opentoonz-appimage.files/launch-opentoonz-appimage.sh b/env-builder-data/build/script/packet/opentoonz-appimage.files/launch-opentoonz-appimage.sh
index 128beb8..96589fa 100755
--- a/env-builder-data/build/script/packet/opentoonz-appimage.files/launch-opentoonz-appimage.sh
+++ b/env-builder-data/build/script/packet/opentoonz-appimage.files/launch-opentoonz-appimage.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-OLDDIR=`pwd`
 cd `dirname "$0"`
 SCRIPT_DIR=`pwd`
 BASE_DIR=`dirname "$SCRIPT_DIR"`
@@ -10,14 +9,7 @@ export QT_XKB_CONFIG_ROOT=$QT_XKB_CONFIG_ROOT:/usr/local/share/X11/xkb:/usr/shar
 export FONTCONFIG_PATH=/etc/fonts
 
 if [ "$1" = "--appimage-exec" ]; then
-	if ! "${@:2}"; then
-		cd "$OLDDIR"
-		exit 1
-	fi
+	"${@:2}"
 else
-	if ! "./launch-opentoonz.sh.wrapper" "$@"; then
-		cd "$OLDDIR"
-		exit 1
-	fi
+	"./launch-opentoonz.sh.wrapper" "$@"
 fi
-cd "$OLDDIR"
diff --git a/env-builder-data/build/script/packet/opentoonz-master.files/launch-opentoonz.sh b/env-builder-data/build/script/packet/opentoonz-master.files/launch-opentoonz.sh
index 57f8132..70fd1b3 100755
--- a/env-builder-data/build/script/packet/opentoonz-master.files/launch-opentoonz.sh
+++ b/env-builder-data/build/script/packet/opentoonz-master.files/launch-opentoonz.sh
@@ -1,8 +1,6 @@
 #!/bin/sh
 
-OLDDIR=`pwd`
 SCRIPT_DIR=$(cd `dirname "$0"`; pwd)
-cd "$OLDDIR"
 BASE_DIR=`dirname "$SCRIPT_DIR"`
 
 export LD_LIBRARY_PATH="$BASE_DIR/lib:$BASE_DIR/lib/opentoonz:$BASE_DIR/lib64:$LD_LIBRARY_PATH"
@@ -95,8 +93,4 @@ else
 fi
 
 cd "$BASE_DIR/bin"
-if ! ./opentoonz "$@"; then
-	cd "$OLDDIR"
-	exit 1
-fi
-cd "$OLDDIR"
+./opentoonz "$@"