diff --git a/config/galaxy.ini.sample b/config/galaxy.ini.sample
index 10c3f633a7e..c9be8ab844a 100644
--- a/config/galaxy.ini.sample
+++ b/config/galaxy.ini.sample
@@ -836,7 +836,7 @@ use_interactive = True
 #toolform_upgrade = True
 
 # Use new tool form in workflow editor
-#workflow_toolform_upgrade = False
+#workflow_toolform_upgrade = True
 
 # Enable Galaxy to communicate directly with a sequencer
 #enable_sequencer_communication = False
diff --git a/templates/webapps/galaxy/workflow/editor.mako b/templates/webapps/galaxy/workflow/editor.mako
index 136bd7d6c94..9575c99b74f 100644
--- a/templates/webapps/galaxy/workflow/editor.mako
+++ b/templates/webapps/galaxy/workflow/editor.mako
@@ -33,7 +33,7 @@
 
     <script type='text/javascript'>
         // Switch for new tool form
-        %if util.string_as_bool(trans.app.config.get('workflow_toolform_upgrade',  False)):
+        %if util.string_as_bool(trans.app.config.get('workflow_toolform_upgrade',  True)):
         __NEWTOOLFORM__ = true;
         %endif
         
diff --git a/templates/webapps/galaxy/workflow/editor_tool_form.mako b/templates/webapps/galaxy/workflow/editor_tool_form.mako
index e999b27ec14..6bd48cdc11f 100644
--- a/templates/webapps/galaxy/workflow/editor_tool_form.mako
+++ b/templates/webapps/galaxy/workflow/editor_tool_form.mako
@@ -1,5 +1,5 @@
 ## TEMPORARY SWITCH FOR THE NEW TOOL FORM
-%if util.string_as_bool(trans.app.config.get('workflow_toolform_upgrade',  False)):
+%if util.string_as_bool(trans.app.config.get('workflow_toolform_upgrade',  True)):
     ${h.js("libs/bibtex", "libs/jquery/jquery-ui")}
     ${h.css('jquery-ui/smoothness/jquery-ui')}
     <%