diff --git a/Templates/BaseGame/game/tools/assetBrowser/main.tscript b/Templates/BaseGame/game/tools/assetBrowser/main.tscript
index c912f2ee3..d2c935100 100644
--- a/Templates/BaseGame/game/tools/assetBrowser/main.tscript
+++ b/Templates/BaseGame/game/tools/assetBrowser/main.tscript
@@ -184,6 +184,10 @@ function AssetBrowserPlugin::initSettings( %this )
 
    EditorSettings.setDefaultValue( "AssetImporDefaultConfig",    "DefaultConfig" );
    EditorSettings.setDefaultValue( "AutoImport", 1 );
+
+   EditorSettings.beginGroup( "New" );
+   EditorSettings.setDefaultValue( "alwaysPromptModuleTarget", 0 );
+   EditorSettings.endGroup();
    
    EditorSettings.beginGroup( "Browser" );
    
diff --git a/Templates/BaseGame/game/tools/main.tscript b/Templates/BaseGame/game/tools/main.tscript
index df21eca44..bdf0ea2e3 100644
--- a/Templates/BaseGame/game/tools/main.tscript
+++ b/Templates/BaseGame/game/tools/main.tscript
@@ -100,12 +100,12 @@ function onStart()
       $editors[%i] = getWord( $Tools::loadFirst, %i );
    }
    
-   %pattern = $Tools::resourcePath @ "/*/main." @ $TorqueScriptFileExtension;
+   %pattern = $Tools::resourcePath @ "/*/main." @ $TorqueScriptFileExtension @ ".dso";
    %folder = findFirstFile( %pattern );
    if ( %folder $= "")
    {
       // if we have absolutely no matches for main.tscript, we look for main.tscript.dso
-      %pattern = $Tools::resourcePath @ "/*/main." @ $TorqueScriptFileExtension @ ".dso";
+      %pattern = $Tools::resourcePath @ "/*/main." @ $TorqueScriptFileExtension;
       %folder = findFirstFile( %pattern );
    }
    while ( %folder !$= "" )
@@ -128,12 +128,12 @@ function onStart()
    }
    
    //Next, scrape through modules and scan for tools subfolders there
-   %pattern = "data/*/editor." @ $TorqueScriptFileExtension;
+   %pattern = "data/*/editor." @ $TorqueScriptFileExtension @ ".dso";
    %folder = findFirstFile( %pattern );
    if ( %folder $= "")
    {
       // if we have absolutely no matches for main.tscript, we look for main.tscript.dso
-      %pattern = "data/*/editor." @ $TorqueScriptFileExtension @ ".dso";
+      %pattern = "data/*/editor." @ $TorqueScriptFileExtension;
       %folder = findFirstFile( %pattern );
    }
    while ( %folder !$= "" )