diff --git a/openslides/agenda/static/js/agenda/site.js b/openslides/agenda/static/js/agenda/site.js
index 23295162c..319c87f81 100644
--- a/openslides/agenda/static/js/agenda/site.js
+++ b/openslides/agenda/static/js/agenda/site.js
@@ -142,16 +142,6 @@ angular.module('OpenSlidesApp.agenda.site', ['OpenSlidesApp.agenda'])
         $scope.newDialog = function () {
             ngDialog.open(CustomslideForm.getDialog());
         };
-        // open edit dialog
-        $scope.editDialog = function (item) {
-            $state.go(item.content_object.collection.replace('/','.')+'.detail.update',
-                {id: item.content_object.id});
-        };
-        // detail view of related item (content object)
-        $scope.open = function (item) {
-            $state.go(item.content_object.collection.replace('/','.')+'.detail',
-                {id: item.content_object.id});
-        };
         // cancel QuickEdit mode
         $scope.cancelQuickEdit = function (item) {
             // revert all changes by restore (refresh) original item object from server
@@ -264,12 +254,6 @@ angular.module('OpenSlidesApp.agenda.site', ['OpenSlidesApp.agenda'])
             $scope.speakers = $filter('orderBy')(item.speakers, 'weight');
         });
 
-        // go to detail view of related item (content object)
-        $scope.open = function (item) {
-            $state.go(item.content_object.collection.replace('/','.')+'.detail',
-                {id: item.content_object.id});
-        };
-
         // close/open list of speakers of current item
         $scope.closeList = function (listClosed) {
             item.speaker_list_closed = listClosed;
diff --git a/openslides/agenda/static/templates/agenda/item-detail.html b/openslides/agenda/static/templates/agenda/item-detail.html
index 67169b2f8..b07123cf5 100644
--- a/openslides/agenda/static/templates/agenda/item-detail.html
+++ b/openslides/agenda/static/templates/agenda/item-detail.html
@@ -5,7 +5,7 @@
         <i class="fa fa-angle-double-left fa-lg"></i>
         <translate>Agenda</translate>
       </a>
-      <a href="" ng-click="open(item)" class="btn btn-sm btn-default">
+      <a ui-sref="{{ item.content_object.collection.replace('/','.') }}.detail({id: item.content_object.id})" class="btn btn-sm btn-default">
         <i class="fa fa-angle-double-left fa-lg"></i>
         {{ item.getContentResource().verboseName | translate }}
       </a>
diff --git a/openslides/agenda/static/templates/agenda/item-list.html b/openslides/agenda/static/templates/agenda/item-list.html
index 07e5c5837..156eb3e4a 100644
--- a/openslides/agenda/static/templates/agenda/item-list.html
+++ b/openslides/agenda/static/templates/agenda/item-list.html
@@ -169,7 +169,7 @@
         <td ng-if="!item.quickEdit" ng-mouseover="item.hover=true" ng-mouseleave="item.hover=false"
             style="padding-left: calc(8px + {{ item.parentCount }}*15px)">
           <strong>
-            <a ng-show="isAllowedToSeeOpenLink(item)" href="" ng-click="open(item)">
+            <a ui-sref="{{ item.content_object.collection.replace('/','.') }}.detail({id: item.content_object.id})" ng-show="isAllowedToSeeOpenLink(item)">
               {{ item.getListViewTitle() }}
             </a>
             <span ng-hide="isAllowedToSeeOpenLink(item)">
@@ -183,7 +183,8 @@
           <div os-perms="agenda.can_see" class="hoverActions" ng-class="{'hiddenDiv': !item.hover}">
             <a ui-sref="agenda.item.detail({id: item.id})" translate>List of speakers</a>
             <span os-perms="agenda.can_manage"> |
-              <a href="" ng-click="editDialog(item)" translate>Edit</a> |
+              <a ui-sref="{{ item.content_object.collection.replace('/','.') }}.detail.update({id: item.content_object.id})"
+                  translate>Edit</a> |
               <a href="" ng-click="item.quickEdit=true" translate>QuickEdit</a> |
               <a href="" class="text-danger"
                 ng-bootbox-confirm="{{ 'Are you sure you want to delete this entry?' | translate }}<br>
@@ -233,7 +234,8 @@
             <button ng-click="save(item)" class="btn btn-primary" translate>
               Update
             </button>
-            <a href="" ng-click="editDialog(item)" class="pull-right"><translate>Edit ...</translate></a>
+            <a ui-sref="{{ item.content_object.collection.replace('/','.') }}.detail.update({id: item.content_object.id})"
+                class="pull-right"><translate>Edit ...</translate></a>
           </div>
   </table>
   <uib-pagination ng-show="itemsFiltered.length > itemsPerPage" total-items="itemsFiltered.length" items-per-page="itemsPerPage" ng-model="currentPage"