diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 72e14656f3..a36b9ace93 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1185,7 +1185,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     // we just want to see if --scripts was set, we've already parsed it and done
     // the change in PathUtils.  Rather than pass that in the constructor, lets just
     // look (this could be debated)
-    QDir defaultScriptsLocation(getCmdOption(argc, constArgv, "--scripts"));
+    QString scriptsSwitch = QString("--").append(SCRIPTS_SWITCH);
+    QDir defaultScriptsLocation(getCmdOption(argc, constArgv, scriptsSwitch.toStdString().c_str()));
     if (!defaultScriptsLocation.exists()) {
         scriptEngines->loadDefaultScripts();
         scriptEngines->defaultScriptsLocationOverridden(true);
diff --git a/interface/src/Application.h b/interface/src/Application.h
index a7aded006b..c26b3b215e 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -95,6 +95,7 @@ static const UINT UWM_SHOW_APPLICATION =
 #endif
 
 static const QString RUNNING_MARKER_FILENAME = "Interface.running";
+static const QString SCRIPTS_SWITCH = "scripts";
 
 class Application;
 #if defined(qApp)
diff --git a/interface/src/main.cpp b/interface/src/main.cpp
index ac1b6d5010..ebe6ebc7b5 100644
--- a/interface/src/main.cpp
+++ b/interface/src/main.cpp
@@ -73,7 +73,7 @@ int main(int argc, const char* argv[]) {
     QCommandLineOption serverContentPathOption("serverContentPath", "Where to find server content", "serverContentPath");
     QCommandLineOption allowMultipleInstancesOption("allowMultipleInstances", "Allow multiple instances to run");
     QCommandLineOption overrideAppLocalDataPathOption("cache", "set test cache <dir>", "dir");
-    QCommandLineOption overrideScriptsPathOption("scripts", "set scripts <path>", "path");
+    QCommandLineOption overrideScriptsPathOption(SCRIPTS_SWITCH, "set scripts <path>", "path");
     parser.addOption(urlOption);
     parser.addOption(noUpdaterOption);
     parser.addOption(checkMinSpecOption);
@@ -101,7 +101,9 @@ int main(int argc, const char* argv[]) {
     if (allowMultipleInstances) {
         instanceMightBeRunning = false;
     }
-
+    // this needs to be done here in main, as the mechanism for setting the 
+    // scripts directory appears not to work.  See the bug report
+    // https://highfidelity.fogbugz.com/f/cases/5759/Issues-changing-scripts-directory-in-ScriptsEngine
     if (parser.isSet(overrideScriptsPathOption)) {
         QDir scriptsPath(parser.value(overrideScriptsPathOption));
         if (scriptsPath.exists()) {