diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/io.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/io.js
index 8226cfb040..32c3b58df7 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/io.js
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/io.js
@@ -73,8 +73,12 @@ define(function(require) {
 
   function _setup(context) {
     $("input[name='graphics_type']", context).change(function() {
-      $("#TYPE", context).val($(this).attr("value"))
-      $("#LISTEN", context).val("0.0.0.0")
+      $("#TYPE", context).val($(this).attr("value"));
+      if ($(this).attr("value") !== '') {
+        $("#LISTEN", context).val("0.0.0.0");
+      } else {
+        $("#LISTEN", context).val('');
+      }
     });
 
     context.off("click", '#add_input');
diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/io/html.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/io/html.hbs
index ba740d29ab..32c4ed32e5 100644
--- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/io/html.hbs
+++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/io/html.hbs
@@ -20,6 +20,8 @@
       <legend>{{tr "Graphics"}}</legend>
       <div class="row">
         <div class="large-12 columns text-center">
+          <input type="radio" name="graphics_type" ID="radioNoneType" value="">
+          <label for="radioNoneType">{{tr "None"}}</label>
           <input type="radio" name="graphics_type" ID="radioVncType" value="VNC">
           <label for="radioVncType">VNC</label>
           <input type="radio" name="graphics_type" ID="radioSdlType" value="SDL" class="hypervisor only_kvm only_vmware only_xen" >