diff --git a/libraries/script-engine/src/ScriptEngines.cpp b/libraries/script-engine/src/ScriptEngines.cpp
index 2c3f7308fa..339953cdb4 100644
--- a/libraries/script-engine/src/ScriptEngines.cpp
+++ b/libraries/script-engine/src/ScriptEngines.cpp
@@ -216,7 +216,7 @@ QVariantList ScriptEngines::getRunning() {
 static const QString SETTINGS_KEY = "Settings";
 
 void ScriptEngines::loadDefaultScripts() {
-    loadScript(defaultScriptsLocation() + "/defaultScripts.js");
+    loadScript(defaultScriptsLocation() + "/scripts/defaultScripts.js");
 }
 
 void ScriptEngines::loadOneScript(const QString& scriptFilename) {
diff --git a/libraries/script-engine/src/ScriptsModel.cpp b/libraries/script-engine/src/ScriptsModel.cpp
index 192a1f84e5..a94ccc9771 100644
--- a/libraries/script-engine/src/ScriptsModel.cpp
+++ b/libraries/script-engine/src/ScriptsModel.cpp
@@ -158,13 +158,13 @@ void ScriptsModel::requestDefaultFiles(QString marker) {
     QUrl url(defaultScriptsLocation());
 
     if (url.isLocalFile()) {
-        // QDirIterator it(url.toLocalFile(), QStringList() << "*.js", QDir::Files, QDirIterator::Subdirectories);
-        // while (it.hasNext()) {
-        //     QString jsFile = it.next();;
-        //     _treeNodes.append(new TreeNodeScript(lastKey.mid(MODELS_LOCATION.length()),
-        //                                          defaultScriptsLocation() + "/" + jsFile,
-        //                                          SCRIPT_ORIGIN_DEFAULT));
-        // }
+        QString localDir = url.toLocalFile() + "/scripts";
+        QDirIterator it(localDir, QStringList() << "*.js", QDir::Files, QDirIterator::Subdirectories);
+        while (it.hasNext()) {
+            QString jsFullPath = it.next();
+            QString jsPartialPath = jsFullPath.mid(localDir.length() + 1); // + 1 to skip a separator
+            _treeNodes.append(new TreeNodeScript(jsPartialPath, jsFullPath, SCRIPT_ORIGIN_DEFAULT));
+        }
     } else {
         QUrlQuery query;
         query.addQueryItem(PREFIX_PARAMETER_NAME, MODELS_LOCATION);
diff --git a/libraries/shared/src/PathUtils.cpp b/libraries/shared/src/PathUtils.cpp
index 46eb61ea72..4b4a9efa9e 100644
--- a/libraries/shared/src/PathUtils.cpp
+++ b/libraries/shared/src/PathUtils.cpp
@@ -56,11 +56,10 @@ QString findMostRecentFileExtension(const QString& originalFileName, QVector<QSt
 
 QString defaultScriptsLocation() {
 #ifdef Q_OS_WIN
-    // return "file:///" + QCoreApplication::applicationDirPath() + "/scripts";
-    return "http://s3.amazonaws.com/hifi-public/scripts";
+    return "file:///" + QCoreApplication::applicationDirPath();
 #elif defined(Q_OS_OSX)
-    return "file:///" + QCoreApplication::applicationDirPath() + "/../../scripts";
+    return "file:///" + QCoreApplication::applicationDirPath() + "/../..";
 #else
-    return "http://s3.amazonaws.com/hifi-public/scripts";
+    return "http://s3.amazonaws.com/hifi-public";
 #endif
 }