diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-inputs.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-inputs.js
index 07c93843f2..dd3d8ce26c 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-inputs.js
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-inputs.js
@@ -248,7 +248,7 @@ define(function(require) {
     }
     
     attr.visor = attr.type === "number";
-    UserInputs.insertAttributeInputMB(attr, $("div.memory_input", context), false);
+    UserInputs.insertAttributeInputMB(attr, $("div.memory_input", context), true, attr.type === "number");
 
     if (Config.isFeatureEnabled("instantiate_hide_cpu")){
       $(".vcpu_input input", context).prop("required", true);
diff --git a/src/sunstone/public/app/utils/user-inputs.js b/src/sunstone/public/app/utils/user-inputs.js
index a70672f5ec..d171fcaacd 100644
--- a/src/sunstone/public/app/utils/user-inputs.js
+++ b/src/sunstone/public/app/utils/user-inputs.js
@@ -712,22 +712,21 @@ define(function(require) {
    * @param  {object} attr structure as returned by parse
    * @param  {jQuery} div jQuery selector for the div to attach the html to
    */
-  function _insertAttributeInputMB(attr, div, inputUnit = true) {
+  function _insertAttributeInputMB(attr, div, displayUnit=true, editUnit = true) {
     // Modified input for GB
     var attr_gb = $.extend({}, attr);
     if (attr.type == "range"){
       attr.tick_size = 1024;
     }
     var select = '';
-    var selectInput = inputUnit? '': 'disabled';
-    if(attr && attr.visor){
+    var selectInput = editUnit? '': 'disabled';
+    if(displayUnit){
       var select = "<select class=\"mb_input_unit\" "+selectInput+">" +
         "<option value=\"MB\">"+Locale.tr("MB")+"</option>" +
         "<option value=\"GB\">"+Locale.tr("GB")+"</option>" +
         "<option value=\"TB\">"+Locale.tr("TB")+"</option>" +
       "</select>";
     }
-    
 
     div.html(
       "<div class=\"input-group mb_input_wrapper\" style=\"display:flex;align-items:center;\"" + ">"+