diff --git a/static/scripts/galaxy.workflow_editor.canvas.js b/static/scripts/galaxy.workflow_editor.canvas.js
index 4c51a91cfb5..e967d24c962 100644
--- a/static/scripts/galaxy.workflow_editor.canvas.js
+++ b/static/scripts/galaxy.workflow_editor.canvas.js
@@ -446,16 +446,18 @@ $.extend( Workflow.prototype, {
         parent.show_form_for_tool( "<div>No node selected</div>" );
     },
     activate_node : function( node ) {
-        this.clear_active_node();
-        parent.show_form_for_tool( node.form_html, node );
-        node.make_active();
-        this.active_node = node;
+        if ( this.active_node != node ) {
+            this.clear_active_node();
+            parent.show_form_for_tool( node.form_html, node );
+            node.make_active();
+            this.active_node = node;
+        }
     },
     node_changed : function ( node ) {
         this.has_changes = true;
         if ( this.active_node == node ) {
             // Reactive with new form_html
-            this.activate_node( node );
+            parent.show_form_for_tool( node.form_html, node );
         }
     }
 });