diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js
index f3deb66d6ba..ff130d3e301 100644
--- a/ui/scripts/instanceWizard.js
+++ b/ui/scripts/instanceWizard.js
@@ -317,7 +317,15 @@
 				  url: createURL('listAffinityGroups'),
 					success: function(json) {					 
 					  var items = json.listaffinitygroupsresponse.affinitygroup;
-						args.response.success({data: {affinityGroups: items}});
+					  var data = { 
+					    affinityGroups: items 
+					  };
+					  if('affinityGroups' in args.context) {
+					    $.extend(data, {
+					      selectedObj: args.context.affinityGroups[0]
+					    });					    
+					  }					  
+						args.response.success({data: data});
 					}
 				});		
       },
diff --git a/ui/scripts/ui-custom/instanceWizard.js b/ui/scripts/ui-custom/instanceWizard.js
index bdc05c11bf7..ea7acf8dca5 100644
--- a/ui/scripts/ui-custom/instanceWizard.js
+++ b/ui/scripts/ui-custom/instanceWizard.js
@@ -86,7 +86,7 @@
           });
         };
 
-        var makeSelects = function(name, data, fields, options) {
+        var makeSelects = function(name, data, fields, options, selectedObj) {
           var $selects = $('<div>');
           options = options ? options : {};
 
@@ -151,7 +151,11 @@
                       .append($('<div>').addClass('desc').html(_s(this[fields.desc])))
                   )
                   .data('json-obj', this);
-
+            
+            if(selectedObj != null && selectedObj.id == item.id) {                
+              $select.find('input[type=checkbox]').attr('checked', 'checked');           
+            }                        
+            
             $selects.append($select);
 
             if (item._singleSelect) {
@@ -493,14 +497,20 @@
                       )
                     );
                     $step.find('.select-container').append(
-                      makeSelects('affinity-groups', args.data.affinityGroups, {
-                        name: 'name',
-                        desc: 'description',
-                        id: 'id'
-                      }, {
-                        type: 'checkbox',
-                        'wizard-field': 'affinity-groups'
-                      })
+                      makeSelects(
+                        'affinity-groups', 
+                        args.data.affinityGroups, 
+                        {
+                          name: 'name',
+                          desc: 'description',
+                          id: 'id'
+                        }, 
+                        {
+                          type: 'checkbox',
+                          'wizard-field': 'affinity-groups'
+                        },
+                        args.data.selectedObj
+                      )
                     ); 
                   } else {
                     $step.find('.select-container').append($('<p>').html(_l('message.no.affinity.groups')));