diff --git a/templates/workflow/build_from_current_history.mako b/templates/workflow/build_from_current_history.mako
index 3e7678cb6bc..6f3cfbface4 100644
--- a/templates/workflow/build_from_current_history.mako
+++ b/templates/workflow/build_from_current_history.mako
@@ -78,7 +78,7 @@ into a workflow will be shown in gray.</p>
 <form method="post" action="${h.url_for()}">
 <div class='form-row'>
     <label>${_('Workflow name')}</label>
-    <input name="workflow_name" type="text" value="Workflow constructed from history '${history.name}'" size="60"/>
+    <input name="workflow_name" type="text" value="Workflow constructed from history '${ util.unicodify( history.name )}'" size="60"/>
 </div>
 <p>
     <input type="submit" value="${_('Create Workflow')}" />
diff --git a/templates/workflow/run_complete.mako b/templates/workflow/run_complete.mako
index 0cfd6648e84..4e2ce7a2f80 100644
--- a/templates/workflow/run_complete.mako
+++ b/templates/workflow/run_complete.mako
@@ -1,7 +1,7 @@
 <%inherit file="/base.mako"/>
 
 <div class="donemessagelarge">
-    Successfully ran workflow "${workflow.name}". The following datasets have been added to the queue:
+    Successfully ran workflow "${util.unicodify( workflow.name )}". The following datasets have been added to the queue:
     %for invocation in invocations:
         <div class="workflow-invocation-complete">
             %if invocation['new_history']:
@@ -14,7 +14,7 @@
                 %for step_outputs in invocation['outputs'].itervalues():
                     %for data in step_outputs.itervalues():
                         %if not invocation['new_history'] or data.history == invocation['new_history']:
-                            <p><strong>${data.hid}</strong>: ${data.name}</p>
+                            <p><strong>${data.hid}</strong>: ${util.unicodify( data.name )}</p>
                         %endif
                     %endfor
                 %endfor