diff --git a/client/galaxy/scripts/mvc/tool/tool-form-composite.js b/client/galaxy/scripts/mvc/tool/tool-form-composite.js
index 0427ea695a0..2ac0ec16e44 100644
--- a/client/galaxy/scripts/mvc/tool/tool-form-composite.js
+++ b/client/galaxy/scripts/mvc/tool/tool-form-composite.js
@@ -222,6 +222,7 @@ var View = Backbone.View.extend({
     _renderHeader: function() {
         var self = this;
         this.execute_btn = new Ui.Button({
+            id: "run-workflow",
             icon: "fa-check",
             title: _l("Run workflow"),
             cls: "btn btn-primary",
@@ -233,7 +234,7 @@ var View = Backbone.View.extend({
             .addClass("h4")
             .empty()
             .append(`<b>Workflow: ${this.model.get("name")}<b>`)
-            .append(this.execute_btn.$el.addClass("float-right mt-3"));
+            .append(this.execute_btn.$el);
     },
 
     /** Render message */
diff --git a/client/galaxy/style/scss/base.scss b/client/galaxy/style/scss/base.scss
index 738aa4fc9bd..4d0c44942f9 100644
--- a/client/galaxy/style/scss/base.scss
+++ b/client/galaxy/style/scss/base.scss
@@ -728,6 +728,11 @@ div.form-row-error-message {
     margin-top: 5px;
 }
 
+#run-workflow {
+    @include float-right;
+    @extend .mt-3;
+}
+
 .workflow-right {
     background: white;
 }