diff --git a/templates/webapps/galaxy/workflow/editor.mako b/templates/webapps/galaxy/workflow/editor.mako
index 364bd9ad8e9..5fdb9bb592f 100644
--- a/templates/webapps/galaxy/workflow/editor.mako
+++ b/templates/webapps/galaxy/workflow/editor.mako
@@ -291,6 +291,8 @@
 </%def>
 
 <%def name="left_panel()">
+    <% from galaxy.tools import Tool, ToolSection, ToolSectionLabel %>
+
     <div class="unified-panel-header" unselectable="on">
         <div class='unified-panel-header-inner'>
             ${n_('Tools')}
@@ -306,9 +308,9 @@
             <div class="toolSectionList">
                 %for key, val in app.toolbox.tool_panel.items():
                     <div class="toolSectionWrapper">
-                    %if key.startswith( 'tool' ):
+                    %if isinstance( val, Tool ):
                         ${render_tool( val, False )}
-                    %elif key.startswith( 'section' ) and val.elems:
+                    %elif isinstance( val, ToolSection ) and val.elems:
                     <% section = val %>
                         <div class="toolSectionTitle" id="title_${section.id}">
                             <span>${section.name}</span>
@@ -316,15 +318,15 @@
                         <div id="${section.id}" class="toolSectionBody">
                             <div class="toolSectionBg">
                                 %for section_key, section_val in section.elems.items():
-                                    %if section_key.startswith( 'tool' ):
+                                    %if isinstance( section_val, Tool ):
                                         ${render_tool( section_val, True )}
-                                    %elif section_key.startswith( 'label' ):
+                                    %elif isinstance( section_val, ToolSectionLabel ):
                                         ${render_label( section_val )}
                                     %endif
                                 %endfor
                             </div>
                         </div>
-                    %elif key.startswith( 'label' ):
+                    %elif isinstance( val, ToolSectionLabel ):
                         ${render_label( val )}
                     %endif
                     </div>