diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js
index 348e7a6bd5..0ba5a0e238 100644
--- a/src/sunstone/public/js/plugins/vms-tab.js
+++ b/src/sunstone/public/js/plugins/vms-tab.js
@@ -2215,6 +2215,21 @@ function setupAttachDiskDialog(){
         var vm_id = $('#vm_id', this).text();
 
         var data  = {};
+
+        if($('input[type=radio]:checked', dialog).val()=="image")
+        {
+          // Clear the volatile fields
+          $('input#FORMAT',   dialog).val("");
+          $('input#SIZE_TMP', dialog).val("");
+        }
+        else
+        {
+          $('input#IMAGE_ID',   dialog).val("");
+          $('input#IMAGE',      dialog).val("");
+          $('input#IMAGE_UID',  dialog).val("");
+          $('input#IMAGE_UNAME',dialog).val("");
+        }
+
         addSectionJSON(data, this);
 
         var obj = {DISK: data}