diff --git a/ui/scripts/ui-custom/instanceWizard.js b/ui/scripts/ui-custom/instanceWizard.js
index e8f0c45b20b..e8b0f394091 100644
--- a/ui/scripts/ui-custom/instanceWizard.js
+++ b/ui/scripts/ui-custom/instanceWizard.js
@@ -1086,15 +1086,21 @@
 
                     // Next button
                     if ($target.closest('div.button.next').size()) {
-                        // Make sure ISO or template is selected
-                        if ($activeStep.hasClass('select-iso') && !$activeStep.find('.content:visible input:checked').size()) {
-                            cloudStack.dialog.notice({
-                                message: 'message.step.1.continue'
-                            });
-                            return false;
-                        }
-
-                        //step 5 - select network
+                        //step 2 - select template/ISO
+                    	if($activeStep.hasClass('select-iso')) {	                        
+                    		if ($activeStep.find('.content:visible input:checked').size() == 0) {
+	                            cloudStack.dialog.notice({
+	                                message: 'message.step.1.continue'
+	                            });
+	                            return false;
+	                        }	
+	                        $(window).trigger("cloudStack.module.instanceWizard.clickNextButton", {
+	                        	$form: $form,
+                            	currentStep: 2
+                            });   	                       
+                    	}                    	
+                        
+                        //step 6 - select network
                         if ($activeStep.find('.wizard-step-conditional.select-network:visible').size() > 0) {
                             var data = $activeStep.data('my-networks');