diff --git a/app/portainer/components/endpoint-list/endpoint-item/endpoint-item-controller.js b/app/portainer/components/endpoint-list/endpoint-item/endpoint-item-controller.js
new file mode 100644
index 000000000..62433ee25
--- /dev/null
+++ b/app/portainer/components/endpoint-list/endpoint-item/endpoint-item-controller.js
@@ -0,0 +1,12 @@
+angular.module('portainer.app').controller('EndpointItemController', [
+  function EndpointItemController() {
+    var ctrl = this;
+
+    ctrl.editEndpoint = editEndpoint;
+
+    function editEndpoint(event) {
+      event.stopPropagation();
+      ctrl.onEdit(ctrl.model.Id);
+    }
+  }
+]);
diff --git a/app/portainer/components/endpoint-list/endpoint-item/endpointItem.html b/app/portainer/components/endpoint-list/endpoint-item/endpointItem.html
index 322ab9a90..6e643da5b 100644
--- a/app/portainer/components/endpoint-list/endpoint-item/endpointItem.html
+++ b/app/portainer/components/endpoint-list/endpoint-item/endpointItem.html
@@ -21,8 +21,16 @@
 
           </span>
         </span>
-        <span class="small">
-          Group: {{ $ctrl.model.GroupName }}
+        <span>
+
+          <span class="small">
+            Group: {{ $ctrl.model.GroupName }}
+          </span>
+          <button
+            ng-if="$ctrl.isAdmin" 
+            class="btn btn-link btn-xs"
+            ng-click="$ctrl.editEndpoint($event)"><i class="fa fa-pencil-alt"></i>
+          </button>
         </span>
       </div>
 
diff --git a/app/portainer/components/endpoint-list/endpoint-item/endpointItem.js b/app/portainer/components/endpoint-list/endpoint-item/endpointItem.js
index d04fb25cf..450fa089d 100644
--- a/app/portainer/components/endpoint-list/endpoint-item/endpointItem.js
+++ b/app/portainer/components/endpoint-list/endpoint-item/endpointItem.js
@@ -2,6 +2,9 @@ angular.module('portainer.app').component('endpointItem', {
   templateUrl: 'app/portainer/components/endpoint-list/endpoint-item/endpointItem.html',
   bindings: {
     model: '<',
-    onSelect: '<'
-  }
+    onSelect: '<',
+    onEdit: '<',
+    isAdmin:'<'
+  },
+  controller: 'EndpointItemController'
 });
diff --git a/app/portainer/components/endpoint-list/endpoint-list.js b/app/portainer/components/endpoint-list/endpoint-list.js
index d11d7611d..d6a4bd33e 100644
--- a/app/portainer/components/endpoint-list/endpoint-list.js
+++ b/app/portainer/components/endpoint-list/endpoint-list.js
@@ -11,6 +11,8 @@ angular.module('portainer.app').component('endpointList', {
     endpoints: '<',
     dashboardAction: '<',
     snapshotAction: '<',
-    showSnapshotAction: '<'
+    showSnapshotAction: '<',
+    editAction: '<',
+    isAdmin:'<'
   }
 });
diff --git a/app/portainer/components/endpoint-list/endpointList.html b/app/portainer/components/endpoint-list/endpointList.html
index 9110703f9..9b4850dd0 100644
--- a/app/portainer/components/endpoint-list/endpointList.html
+++ b/app/portainer/components/endpoint-list/endpointList.html
@@ -24,6 +24,8 @@
           ng-repeat="endpoint in $ctrl.endpoints | filter:$ctrl.state.textFilter"
           model="endpoint"
           on-select="$ctrl.dashboardAction"
+          on-edit="$ctrl.editAction"
+          is-admin="$ctrl.isAdmin"
         ></endpoint-item>
         <div ng-if="!$ctrl.endpoints" class="text-center text-muted">
           Loading...
diff --git a/app/portainer/views/home/home.html b/app/portainer/views/home/home.html
index e9de46386..1ffaa88bd 100644
--- a/app/portainer/views/home/home.html
+++ b/app/portainer/views/home/home.html
@@ -44,6 +44,8 @@
       dashboard-action="goToDashboard"
       show-snapshot-action="!applicationState.application.authentication || isAdmin"
       snapshot-action="triggerSnapshot"
+      edit-action="goToEdit"
+      is-admin="isAdmin"
     ></endpoint-list>
   </div>
 </div>
diff --git a/app/portainer/views/home/homeController.js b/app/portainer/views/home/homeController.js
index 684c1ff7e..f666e49d7 100644
--- a/app/portainer/views/home/homeController.js
+++ b/app/portainer/views/home/homeController.js
@@ -62,6 +62,12 @@ function ($q, $scope, $state, Authentication, EndpointService, EndpointHelper, G
     });
   }
 
+  $scope.goToEdit = goToEdit;
+
+  function goToEdit(id) {
+    $state.go('portainer.endpoints.endpoint', { id: id });
+  }
+
   function initView() {
     $scope.isAdmin = Authentication.getUserDetails().role === 1;