diff --git a/static/scripts/galaxy.workflow_editor.canvas.js b/static/scripts/galaxy.workflow_editor.canvas.js
index 46c35322a25..fc8691865de 100644
--- a/static/scripts/galaxy.workflow_editor.canvas.js
+++ b/static/scripts/galaxy.workflow_editor.canvas.js
@@ -374,7 +374,7 @@ $.extend( Workflow.prototype, {
 });
 
 function prebuild_node_for_tool( id, title_text ) {
-    var f = $("<div class='toolForm' style='position: absolute; min-width: 130px'></div>");
+    var f = $("<div class='toolForm toolFormInCanvas'></div>");
     var node = new Node( f );
 	node.tool_id = id;
     var title = $("<div class='toolFormTitle unselectable'>" + title_text + "</div>" )
diff --git a/templates/workflow/editor.mako b/templates/workflow/editor.mako
index a1faadda4a4..cd2dd814fe6 100644
--- a/templates/workflow/editor.mako
+++ b/templates/workflow/editor.mako
@@ -20,13 +20,9 @@
     <script type='text/javascript' src="/static/scripts/jquery.js"> </script>
     <script type='text/javascript' src="/static/scripts/jquery.dimensions.js"> </script>
     <script type='text/javascript' src="/static/scripts/jquery.ui.js"> </script>
-    ## <script type='text/javascript' src="/static/scripts/jquery.fx.js"> </script>
-    ## <script type='text/javascript' src="/static/scripts/jquery.fx.drop.js"> </script>
     <script type='text/javascript' src="/static/scripts/jquery.form.js"> </script>
     <script type='text/javascript' src="/static/scripts/jquery.json.js"> </script>
-    ## <script type='text/javascript' src="/static/scripts/jquery.center.js"> </script>
-    ## <script type='text/javascript' src="/static/scripts/jquery.corner.js"> </script>
-    
+
     <script type='text/javascript'>
     /* Dialog and menu handling tools to be moved to galaxy.layout.js */
     
@@ -368,6 +364,20 @@
     cursor: pointer;
     }
     
+    ## Extra styles for the representation of a tool on the canvas (looks like
+    ## a tiny tool form)
+    div.toolFormInCanvas {
+        z-index: 100;
+        position: absolute;
+        min-width: 130px;
+        margin: 6px;
+    }
+    
+    div.toolForm-active {
+        border: solid #8080FF 4px;
+        margin: 3px;
+    }
+    
     div.toolFormTitle {
         cursor: move;
         min-height: 16px;
@@ -384,18 +394,6 @@
       margin-top: 0.5em;
       margin-bottom: 0.5em;
     }
-    div.toolForm {
-        margin: 6px;
-    }
-    
-    div.toolForm-active {
-        border: solid #8080FF 4px;
-        margin: 3px;
-    }
-    
-    div.tool-node {
-        position: absolute;
-    }
     
     div.tool-node-error div.toolFormTitle {
         background: #FFCCCC;