diff --git a/ui/scripts/affinity.js b/ui/scripts/affinity.js
index d59d1291448..e6e8e34949e 100644
--- a/ui/scripts/affinity.js
+++ b/ui/scripts/affinity.js
@@ -24,8 +24,17 @@
         type: { label: 'label.type' }
       },
       dataProvider: function(args) {
+			  var data = {};				
+				if (args.context != null) {
+          if ("instances" in args.context) {
+					  $.extend(data, {
+						  virtualmachineid: args.context.instances[0].id
+						});           
+          }
+        }			
         $.ajax({
 				  url: createURL('listAffinityGroups'),
+					data: data,
 					success: function(json) {					 
 					  var items = json.listaffinitygroupsresponse.affinitygroup;
 						args.response.success({data: items});
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 03153a1e456..03656e2d3ce 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -284,6 +284,7 @@
         viewAll: [
           { path: 'storage.volumes', label: 'label.volumes' },
           { path: 'vmsnapshots', label: 'label.snapshots' },
+					{ path: 'affinityGroups', label: 'label.affinity.groups' },
           {
             path: '_zone.hosts',
             label: 'label.hosts',