diff --git a/lib/galaxy/webapps/galaxy/controllers/workflow.py b/lib/galaxy/webapps/galaxy/controllers/workflow.py
index efe903eb8ca..7147061842e 100644
--- a/lib/galaxy/webapps/galaxy/controllers/workflow.py
+++ b/lib/galaxy/webapps/galaxy/controllers/workflow.py
@@ -649,7 +649,7 @@ class WorkflowController(BaseUIController, SharableMixin, UsesStoredWorkflowMixi
         return trans.response.send_redirect(f"{url_for('/')}workflow?status=done&message={escape(message)}")
 
     @web.expose
-    @web.json
+    # @web.json
     @web.require_login("edit workflows")
     def editor(self, trans, id=None, workflow_id=None, version=None):
         """
@@ -741,7 +741,8 @@ class WorkflowController(BaseUIController, SharableMixin, UsesStoredWorkflowMixi
         }
 
         # parse to mako
-        return editor_config
+        # return editor_config
+        return trans.fill_template("workflow/editor.mako", editor_config=editor_config)
 
     @web.json
     def load_workflow(self, trans, id, version=None):
diff --git a/templates/webapps/galaxy/workflow/editor.mako b/templates/webapps/galaxy/workflow/editor.mako
new file mode 100644
index 00000000000..abc6b186902
--- /dev/null
+++ b/templates/webapps/galaxy/workflow/editor.mako
@@ -0,0 +1,45 @@
+<%inherit file="/webapps/galaxy/base_panels.mako"/>
+
+<%def name="title()">
+    Workflow Editor
+</%def>
+
+<%def name="init()">
+<%
+    self.active_view="workflow"
+    self.overlay_visible=True
+%>
+</%def>
+
+<%def name="javascript_app()">
+    ${parent.javascript_app()}
+    <script type="text/javascript">
+        var editorConfig = ${ h.dumps( editor_config ) };
+        config.addInitialization(function(galaxy, config) {
+            console.log("workflow/editor.mako, editorConfig", editorConfig);
+            window.bundleEntries.mountWorkflowEditor(editorConfig);
+        });
+    </script>
+</%def>
+
+<%def name="stylesheets()">
+    ## Include "base.css" for styling tool menu and forms (details)
+    ${h.css("jquery-ui/smoothness/jquery-ui" )}
+
+    ## But make sure styles for the layout take precedence
+    ${parent.stylesheets()}
+</%def>
+
+<%def name="overlay(visible=False)">
+    ${parent.overlay( "Loading workflow...",
+                      "<div class='progress progress-striped progress-info active'><div class='progress-bar' style='width: 100%;'></div></div>", self.overlay_visible )}
+</%def>
+
+<%def name="left_panel()">
+</%def>
+
+<%def name="center_panel()">
+</%def>
+
+<%def name="right_panel()">
+</%def>