diff --git a/www/common/sframe-app-framework.js b/www/common/sframe-app-framework.js
index 9e4b1160a..29845697e 100644
--- a/www/common/sframe-app-framework.js
+++ b/www/common/sframe-app-framework.js
@@ -302,7 +302,7 @@ define([
 
             var skipTemp = Util.find(privateDat, ['settings', 'general', 'creation', 'noTemplate']);
             var skipCreation = Util.find(privateDat, ['settings', 'general', 'creation', 'skip']);
-            if (newPad && (!skipTemp && skipCreation)) {
+            if (newPad && (!AppConfig.displayCreationScreen || (!skipTemp && skipCreation))) {
                 common.openTemplatePicker();
             }
         };