diff --git a/src/sunstone/public/app/tabs/images-tab/form-panels/create-common.js b/src/sunstone/public/app/tabs/images-tab/form-panels/create-common.js
index 2b22427ec6..3baa2566ba 100644
--- a/src/sunstone/public/app/tabs/images-tab/form-panels/create-common.js
+++ b/src/sunstone/public/app/tabs/images-tab/form-panels/create-common.js
@@ -432,6 +432,11 @@ define(function(require) {
       break;
     case "datablock":
       size = WizardFields.retrieveInput($('#img_size', context));
+
+      if(size && $(".mb_input_unit", context).val() == "GB"){
+        size = size * 1024;
+        size = size.toString();
+      }
       if (size) img_json["SIZE"] = size;
 
       var vcenter_disk_type = WizardFields.retrieveInput($('#vcenter_disk_type', context));
diff --git a/src/sunstone/public/app/tabs/images-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/images-tab/form-panels/create/wizard.hbs
index b49b8366ec..c4d7684600 100644
--- a/src/sunstone/public/app/tabs/images-tab/form-panels/create/wizard.hbs
+++ b/src/sunstone/public/app/tabs/images-tab/form-panels/create/wizard.hbs
@@ -99,9 +99,19 @@
     <div class="img_size row">
       <div class="medium-6 columns">
         <label for="img_size">
-          {{tr "Size in MB"}}
+          {{tr "Size"}}
         </label>
-        <input type="text" name="img_size" id="img_size" />
+        <div class="input-group mb_input_wrapper">
+          <div class="input-group-field">
+            <input type="text" name="img_size" id="img_size" />
+          </div>
+          <div class="input-group-button">
+            <select class="mb_input_unit">
+              <option value="MB">{{tr "MB"}}</option>
+              <option value="GB" selected>{{tr "GB"}}</option>
+            </select>
+          </div>
+        </div>
       </div>
       <div class="medium-6 columns only_vcenter">
         <label for="vcenter_disk_type">
diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab.js
index 16379a7c4c..f96ed4ee83 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab.js
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab.js
@@ -148,8 +148,9 @@ define(function(require) {
 
     var tmpl = WizardFields.retrieve(selectedContext);
 
-    if(tmpl.SIZE){
+    if($(".mb_input_unit", context).val() == "GB"){
       tmpl.SIZE = tmpl.SIZE * 1024;
+      tmpl.SIZE = tmpl.SIZE.toString();
     }
 
     if($("input[name='" + this.diskTabId + "']:checked", context).val() == "image" && !tmpl["IMAGE"] && !tmpl["IMAGE_ID"]){
diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab/html.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab/html.hbs
index 20ff30e05b..ca8d55eef0 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab/html.hbs
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/storage/disk-tab/html.hbs
@@ -62,11 +62,21 @@
 </div>
 <div id="disk_type" class="volatile" style="display: none;">
   <div class="row">
-    <div class="medium-6 columns left">
+    <div class="medium-6 columns">
       <label for="SIZE">
-        {{tr "Size in GB"}}
+        {{tr "Size"}}
       </label>
-      <input wizard_field="SIZE" type="number" id="SIZE" name="SIZE"/>
+      <div class="input-group mb_input_wrapper">
+        <div class="input-group-field">
+          <input wizard_field="SIZE" type="number" id="SIZE" name="SIZE"/>
+        </div>
+        <div class="input-group-button">
+          <select class="mb_input_unit">
+            <option value="MB">{{tr "MB"}}</option>
+            <option value="GB" selected>{{tr "GB"}}</option>
+          </select>
+        </div>
+      </div>
     </div>
   </div>
   <div class="row">