diff --git a/ui/new/jsp/volume.jsp b/ui/new/jsp/volume.jsp
index 5cb4bb6f9b3..28c7686a829 100644
--- a/ui/new/jsp/volume.jsp
+++ b/ui/new/jsp/volume.jsp
@@ -582,8 +582,8 @@
+
diff --git a/ui/new/scripts/cloud.core2.volume.js b/ui/new/scripts/cloud.core2.volume.js
index f7fbeeeb79a..3aab7019b35 100644
--- a/ui/new/scripts/cloud.core2.volume.js
+++ b/ui/new/scripts/cloud.core2.volume.js
@@ -809,16 +809,18 @@ function doAttachDisk($actionLink, listAPIMap, $detailsTab) {
$("#dialog_attach_volume")
.dialog('option', 'buttons', {
- "Confirm": function() {
- var thisDialog = $(this);
- thisDialog.dialog("close");
+ "OK": function() {
+ var $thisDialog = $(this);
+
+ var isValid = true;
+ isValid &= validateDropDownBox("Virtual Machine", $thisDialog.find("#volume_vm"), $thisDialog.find("#volume_vm_errormsg"));
+ if (!isValid)
+ return;
+
+ $thisDialog.dialog("close");
- var virtualMachineId = thisDialog.find("#volume_vm").val();
- if(virtualMachineId == null) {
- $("#dialog_alert").html("
Please attach volume to a valid virtual machine
").dialog("open");
- return;
- }
-
+ var virtualMachineId = $thisDialog.find("#volume_vm").val();
+
var id = jsonObj.id;
var apiCommand = "command=attachVolume&id="+id+'&virtualMachineId='+virtualMachineId;
doActionToDetailsTab(id, $actionLink, apiCommand, listAPIMap);