diff --git a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/addressSendMessage.js b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/addressSendMessage.js
index 6fc17c65d2..0538ae3e00 100644
--- a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/addressSendMessage.js
+++ b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/addressSendMessage.js
@@ -90,12 +90,14 @@ var Artemis;
                     <div hawtio-editor="$ctrl.message.message" mode="codeMirrorOptions.mode.name"></div>
                 </div>
                 <div class="form-group">
-                    <select class="form-control artemis-send-message-format" ng-model="codeMirrorOptions.mode.name">
+                    <select class="form-control artemis-send-message-format" ng-model="codeMirrorOptions.mode.name"
+                        style="display:inline; width:auto">
                         <option value="javascript">JSON</option>
                         <option value="xml">XML</option>
                     </select>
                     <button class="btn btn-default" ng-click="$ctrl.message.formatMessage()"
-                       title="Automatically pretty prints the message so it's easier to read">Format
+                       title="Automatically pretty prints the message so it's easier to read"
+                       style="vertical-align: initial">Format
                     </button>
                 </div>
             </form>
diff --git a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/sendMessage.js b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/sendMessage.js
index 6705e21583..e4b9cac530 100644
--- a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/sendMessage.js
+++ b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/sendMessage.js
@@ -90,12 +90,14 @@ var Artemis;
                     <div hawtio-editor="$ctrl.message.message" mode="codeMirrorOptions.mode.name"></div>
                 </div>
                 <div class="form-group">
-                    <select class="form-control artemis-send-message-format" ng-model="codeMirrorOptions.mode.name">
+                    <select class="form-control artemis-send-message-format" ng-model="codeMirrorOptions.mode.name"
+                        style="display:inline; width:auto">
                         <option value="javascript">JSON</option>
                         <option value="xml">XML</option>
                     </select>
                     <button class="btn btn-default" ng-click="$ctrl.message.formatMessage()"
-                       title="Automatically pretty prints the message so it's easier to read">Format
+                       title="Automatically pretty prints the message so it's easier to read"
+                       style="vertical-align: initial">Format
                     </button>
                 </div>
             </form>