diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/group-listing/public/js/group-listing.js b/modules/distribution/src/repository/jaggeryapps/iotserver/units/group-listing/public/js/group-listing.js
index 27d27cf5..b0923fcd 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/group-listing/public/js/group-listing.js
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/group-listing/public/js/group-listing.js
@@ -300,7 +300,8 @@ function attachEvents() {
      * on Group Management page in WSO2 IoT Server Console.
      */
     $("a.view-group-link").click(function () {
-        $("#group_data").closest('form').submit();
+        var groupId = $(this).data("groupid");
+        $("#group-data-form-" + groupId).closest('form').submit();
     });
 
     /**
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/group-listing/public/templates/group-listing.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/units/group-listing/public/templates/group-listing.hbs
index 844645b9..a6858c40 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/group-listing/public/templates/group-listing.hbs
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/group-listing/public/templates/group-listing.hbs
@@ -1,6 +1,6 @@
 {{#each groups}}
 	{{groupMap this}}
-    <form action="/iotserver/group/{{id}}" method="POST" id="group_data" >
+    <form id="group-data-form-{{id}}" action="/iotserver/group/{{id}}" method="POST" >
         <input type="hidden" name="name" value="{{name}}">
         <input type="hidden" name="deviceCount" value="{{deviceCount}}">
         <input type="hidden" name="dateOfCreation" value="{{dateOfCreation}}">
@@ -28,7 +28,7 @@
                     <span class="ast-ver">Shared with: {{users}}</span>
 
                     <div href="#" class="ast-btn-group">
-                        <a class="view-group-link" data-group="{{this}}">
+                        <a class="view-group-link" data-groupid="{{id}}">
 											<span class="fw-stack">
 												<i class="fw fw-ring fw-stack-2x"></i>
 												<i class="fw fw-view fw-stack-1x"></i>