diff --git a/client/galaxy/scripts/mvc/ui/ui-options.js b/client/galaxy/scripts/mvc/ui/ui-options.js
index 03fe661287a..762ec17c35d 100644
--- a/client/galaxy/scripts/mvc/ui/ui-options.js
+++ b/client/galaxy/scripts/mvc/ui/ui-options.js
@@ -38,9 +38,9 @@ var Base = Backbone.View.extend({
             .removeClass()
             .addClass("ui-options")
             .addClass(this.model.get("cls"))
-            .append((this.$message = $("<div/>").addClass("mt-2")))
-            .append((this.$menu = $("<div/>").addClass("ui-options-menu")))
-            .append((this.$options = $(this._template())));
+            .append(this.$message = $("<div/>").addClass("mt-2"))
+            .append(this.$menu = $("<div/>").addClass("ui-options-menu"))
+            .append(this.$options = $(this._template()));
 
         // add select/unselect all button
         this.all_button = null;
@@ -298,7 +298,7 @@ RadioButton.View = Base.extend({
 
     /** Main template function */
     _template: function() {
-        return $("<div/>").addClass("btn-group ui-radiobutton d-flex");
+        return $("<div/>").addClass("btn-group ui-radiobutton");
     }
 });
 
diff --git a/client/galaxy/style/scss/ui.scss b/client/galaxy/style/scss/ui.scss
index 5d19dd67279..85f3f6d025b 100644
--- a/client/galaxy/style/scss/ui.scss
+++ b/client/galaxy/style/scss/ui.scss
@@ -452,6 +452,12 @@ $ui-margin-horizontal-large: $margin-v * 2;
     }
 }
 
+.ui-select-content {
+    .btn-group {
+        @extend .d-flex;
+    }
+}
+
 .ui-dragover {
     border-radius: 3px;
     border: 2px solid $table-border-color;