diff --git a/src/gwt/src/org/rstudio/studio/client/shiny/ShinyApplication.java b/src/gwt/src/org/rstudio/studio/client/shiny/ShinyApplication.java
index 792099a5b53..a109129ee80 100644
--- a/src/gwt/src/org/rstudio/studio/client/shiny/ShinyApplication.java
+++ b/src/gwt/src/org/rstudio/studio/client/shiny/ShinyApplication.java
@@ -170,7 +170,7 @@ public void onWindowClosed(WindowClosedEvent event)
          return;
 
       // stop the app if this event wasn't generated by a disconnect
-      if (params_ != null && disconnectingUrl_ == null)
+      if (params_ != null && disconnectingUrl_ == null && stopOnNextClose_)
       {
          params_.setState(ShinyApplicationParams.STATE_STOPPING);
          notifyShinyAppClosed(params_);