diff --git a/direct/src/plugin/p3dInstance.cxx b/direct/src/plugin/p3dInstance.cxx
index 493e8f2317..e46df82db5 100644
--- a/direct/src/plugin/p3dInstance.cxx
+++ b/direct/src/plugin/p3dInstance.cxx
@@ -1267,13 +1267,12 @@ make_splash_window() {
     // We're hidden, and so is the splash window.
     return;
   }
-  /* temp removing: hack for debugging.
-  if (_wparams.get_window_type() != P3D_WT_embedded && !_stuff_to_download) {
+  if (_wparams.get_window_type() != P3D_WT_embedded && 
+      !_stuff_to_download && _auto_start) {
     // If it's a toplevel or fullscreen window, then we don't want a
     // splash window until we have stuff to download.
     return;
   }
-  */
 
   _splash_window = new SplashWindowType(this);
   _splash_window->set_wparams(_wparams);
diff --git a/direct/src/plugin_standalone/panda3d.cxx b/direct/src/plugin_standalone/panda3d.cxx
index 8ef7a8b4f3..2ff2812bde 100644
--- a/direct/src/plugin_standalone/panda3d.cxx
+++ b/direct/src/plugin_standalone/panda3d.cxx
@@ -701,6 +701,10 @@ create_instance(const string &p3d, P3D_window_type window_type,
     tokens.push_back(token);
   }
 
+  token._keyword = "auto_start";
+  token._value = "1";
+  tokens.push_back(token);
+
   P3D_token *tokens_p;
   size_t num_tokens = tokens.size();
   if (!tokens.empty()) {