diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-create/html.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-create/html.hbs
index 28cfb78fd6..c060a6a858 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-create/html.hbs
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-create/html.hbs
@@ -32,7 +32,7 @@
             <input type="number" min="0" step="1" name="memory_gb"/>
           </div>
           <div class="input-group-button">
-            <select id="memory_unit" name="MEMORY_UNIT" style="width: auto;">
+            <select id="memory_unit" name="MEMORY_UNIT" class="mb_input_unit">
               <option value="MB">{{tr "MB"}}</option>
               <option value="GB" selected>{{tr "GB"}}</option>
             </select>
diff --git a/src/sunstone/public/app/utils/user-inputs.js b/src/sunstone/public/app/utils/user-inputs.js
index b9038f8f69..255cbbae48 100644
--- a/src/sunstone/public/app/utils/user-inputs.js
+++ b/src/sunstone/public/app/utils/user-inputs.js
@@ -507,7 +507,7 @@ define(function(require) {
           _attributeInput(attr_gb) +
         '</div>' +
         '<div class="input-group-button">'+
-          '<select id="mb_input_unit">' +
+          '<select class="mb_input_unit">' +
             '<option value="MB">'+Locale.tr("MB")+'</option>' +
             '<option value="GB" selected>'+Locale.tr("GB")+'</option>' +
           '</select>' +
@@ -521,9 +521,9 @@ define(function(require) {
 
     var input_val = $("input, select", $("div.mb_input", div)).val();
     if (input_val == "" || (input_val >= 1024 && (input_val % 1024 == 0))){
-      $("#mb_input_unit", div).val("GB").change();
+      $(".mb_input_unit", div).val("GB").change();
     } else {
-      $("#mb_input_unit", div).val("MB").change();
+      $(".mb_input_unit", div).val("MB").change();
     }
   }
 
@@ -553,8 +553,8 @@ define(function(require) {
     var gb_inputs = $("div.gb_input", context).children().detach();
 
     // Unit select
-    $("#mb_input_unit", context).on('change', function() {
-      var mb_input_unit_val = $('#mb_input_unit :selected', context).val();
+    $(".mb_input_unit", context).on('change', function() {
+      var mb_input_unit_val = $('.mb_input_unit :selected', context).val();
 
       if (mb_input_unit_val == 'GB') {
         $("div.mb_input", context).hide();
@@ -567,7 +567,7 @@ define(function(require) {
       }
     });
 
-    $("#mb_input_unit", context).change();
+    $(".mb_input_unit", context).change();
   }
 
   /**
diff --git a/src/sunstone/public/scss/app.scss b/src/sunstone/public/scss/app.scss
index 45cd7dc8e2..3a0edb6ce9 100644
--- a/src/sunstone/public/scss/app.scss
+++ b/src/sunstone/public/scss/app.scss
@@ -226,6 +226,6 @@ meter {
   color: $alert-color;
 }
 
-#mb_input_unit {
+.mb_input_unit {
   width: 4em;
 }
\ No newline at end of file