diff --git a/.travis.yml b/.travis.yml
index 93bff30e..32c777d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -206,6 +206,7 @@ after_success:
       mkdir -p Cutter.app/Contents/Resources/r2/share &&
       cp -a /usr/local/share/radare2 Cutter.app/Contents/Resources/r2/share/ &&
       "$TRAVIS_BUILD_DIR/scripts/r2ghidra.sh" -DCMAKE_INSTALL_PREFIX="`pwd`/Cutter.app/Contents/Resources/r2" -DBUILD_CUTTER_PLUGIN=ON -DCUTTER_INSTALL_PLUGDIR="`pwd`/Cutter.app/Contents/Resources/plugins/native" -DCUTTER_SOURCE_DIR="$TRAVIS_BUILD_DIR" &&
+      "$TRAVIS_BUILD_DIR/scripts/r2dec.sh" --prefix="`pwd`/Cutter.app/Contents/Resources/r2" &&
       mkdir image && cp -a Cutter.app image/ &&
       export VOL_NAME="Cutter v${CUTTER_VERSION}" &&
       export DMG_TMP_FILE="Cutter-v$CUTTER_VERSION-x64.macOS-tmp.dmg" &&
diff --git a/src/CutterApplication.cpp b/src/CutterApplication.cpp
index 76fa0abd..5d1494a6 100644
--- a/src/CutterApplication.cpp
+++ b/src/CutterApplication.cpp
@@ -216,17 +216,24 @@ CutterApplication::CutterApplication(int &argc, char **argv) : QApplication(argc
         Core()->setConfig("r2ghidra.sleighhome", sleighHome.absolutePath());
 
         auto r2decHome = appdir;
-        appdir.cd("share/radare2/plugins/r2dec-js"); // appdir/share/radare2/plugins/r2dec-js
-        qputenv("R2DEC_HOME", appdir.absolutePath().toLocal8Bit());
+        r2decHome.cd("share/radare2/plugins/r2dec-js"); // appdir/share/radare2/plugins/r2dec-js
+        qputenv("R2DEC_HOME", r2decHome.absolutePath().toLocal8Bit());
     }
 #endif
 
 #ifdef Q_OS_MACOS
     {
-        auto sleighHome = QDir(QCoreApplication::applicationDirPath()); // Contents/MacOS
-        sleighHome.cdUp(); // Contents
-        sleighHome.cd("Resources/r2/share/radare2/plugins/r2ghidra_sleigh"); // Contents/Resources/r2/share/radare2/plugins/r2ghidra_sleigh
+        auto r2prefix = QDir(QCoreApplication::applicationDirPath()); // Contents/MacOS
+        r2prefix.cdUp(); // Contents
+        r2prefix.cd("Resources/r2"); // Contents/Resources/r2
+
+        auto sleighHome = r2prefix;
+        sleighHome.cd("share/radare2/plugins/r2ghidra_sleigh"); // Contents/Resources/r2/share/radare2/plugins/r2ghidra_sleigh
         Core()->setConfig("r2ghidra.sleighhome", sleighHome.absolutePath());
+
+        auto r2decHome = r2prefix;
+        r2decHome.cd("share/radare2/plugins/r2dec-js"); // Contents/Resources/r2/share/radare2/plugins/r2dec-js
+        qputenv("R2DEC_HOME", r2decHome.absolutePath().toLocal8Bit());
     }
 #endif