diff --git a/HISTORY.rst b/HISTORY.rst
index 16541b7c34..37219e7c75 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -197,7 +197,8 @@
 * Update smart link document type selection view to use
   AddRemoveView class.
 * Add smart link created and edited events.
-  
+* Fix smart link ACL support.
+
 3.1.11 (2019-04-XX)
 ===================
 * Fix multiple tag selection wizard step.
diff --git a/docs/releases/3.2.rst b/docs/releases/3.2.rst
index 8476eff8a6..55464b883a 100644
--- a/docs/releases/3.2.rst
+++ b/docs/releases/3.2.rst
@@ -229,6 +229,7 @@ Other changes
 * Update smart link document type selection view to use
   AddRemoveView class.
 * Add smart link created and edited events.
+* Fix smart link ACL support.
 
 Removals
 --------
diff --git a/mayan/apps/linking/tests/test_events.py b/mayan/apps/linking/tests/test_events.py
index 7ffed7dd96..c798109e50 100644
--- a/mayan/apps/linking/tests/test_events.py
+++ b/mayan/apps/linking/tests/test_events.py
@@ -35,7 +35,9 @@ class SmartLinkTemplateEventsTestCase(DocumentTestMixin, SmartLinkTestMixin, Sma
     def test_smart_link_edit_event(self):
         self._create_test_smart_link()
 
-        self.grant_permission(permission=permission_smart_link_edit)
+        self.grant_access(
+            obj=self.test_smart_link, permission=permission_smart_link_edit
+        )
         Action.objects.all().delete()
 
         response = self._request_test_smart_link_edit_view()
diff --git a/mayan/apps/linking/tests/test_views.py b/mayan/apps/linking/tests/test_views.py
index bf00d1eb1f..2f47f8a37b 100644
--- a/mayan/apps/linking/tests/test_views.py
+++ b/mayan/apps/linking/tests/test_views.py
@@ -43,9 +43,11 @@ class SmartLinkViewTestCase(SmartLinkTestMixin, SmartLinkViewTestMixin, GenericV
 
         self.assertEqual(SmartLink.objects.count(), 1)
 
-    def test_smart_link_delete_view_with_permission(self):
+    def test_smart_link_delete_view_with_access(self):
         self._create_test_smart_link()
-        self.grant_permission(permission=permission_smart_link_delete)
+        self.grant_access(
+            obj=self.test_smart_link, permission=permission_smart_link_delete
+        )
 
         response = self._request_test_smart_link_delete_view()
         self.assertEqual(response.status_code, 302)
@@ -61,10 +63,12 @@ class SmartLinkViewTestCase(SmartLinkTestMixin, SmartLinkViewTestMixin, GenericV
         self.test_smart_link.refresh_from_db()
         self.assertEqual(self.test_smart_link.label, TEST_SMART_LINK_LABEL)
 
-    def test_smart_link_edit_view_with_permission(self):
+    def test_smart_link_edit_view_with_access(self):
         self._create_test_smart_link()
 
-        self.grant_permission(permission=permission_smart_link_edit)
+        self.grant_access(
+            obj=self.test_smart_link, permission=permission_smart_link_edit
+        )
 
         response = self._request_test_smart_link_edit_view()
         self.assertEqual(response.status_code, 302)
@@ -74,11 +78,9 @@ class SmartLinkViewTestCase(SmartLinkTestMixin, SmartLinkViewTestMixin, GenericV
 
 
 class SmartLinkDocumentViewTestCase(SmartLinkTestMixin, GenericDocumentViewTestCase):
-    def setup_smart_links(self):
-        self.test_smart_link = SmartLink.objects.create(
-            label=TEST_SMART_LINK_LABEL,
-            dynamic_label=TEST_SMART_LINK_DYNAMIC_LABEL
-        )
+    def setUp(self):
+        super(SmartLinkDocumentViewTestCase, self).setUp()
+        self._create_test_smart_link()
         self.test_smart_link.document_types.add(self.test_document_type)
 
         self.test_smart_link_2 = SmartLink.objects.create(
@@ -94,8 +96,6 @@ class SmartLinkDocumentViewTestCase(SmartLinkTestMixin, GenericDocumentViewTestC
         )
 
     def test_document_smart_link_list_view_no_permission(self):
-        self.setup_smart_links()
-
         self.grant_access(
             obj=self.test_document, permission=permission_document_view
         )
@@ -109,8 +109,6 @@ class SmartLinkDocumentViewTestCase(SmartLinkTestMixin, GenericDocumentViewTestC
         )
 
     def test_document_smart_link_list_view_with_permission(self):
-        self.setup_smart_links()
-
         self.grant_access(
             obj=self.test_smart_link, permission=permission_smart_link_view
         )
diff --git a/mayan/apps/linking/views.py b/mayan/apps/linking/views.py
index 8feae4e590..4e5bb5797f 100644
--- a/mayan/apps/linking/views.py
+++ b/mayan/apps/linking/views.py
@@ -203,10 +203,10 @@ class SmartLinkCreateView(SingleObjectCreateView):
 
 class SmartLinkDeleteView(SingleObjectDeleteView):
     model = SmartLink
+    object_permission = permission_smart_link_delete
     post_action_redirect = reverse_lazy(
         viewname='linking:smart_link_list'
     )
-    view_permission = permission_smart_link_delete
 
     def get_extra_context(self):
         return {
@@ -218,10 +218,10 @@ class SmartLinkDeleteView(SingleObjectDeleteView):
 class SmartLinkEditView(SingleObjectEditView):
     form_class = SmartLinkForm
     model = SmartLink
+    object_permission = permission_smart_link_edit
     post_action_redirect = reverse_lazy(
         viewname='linking:smart_link_list'
     )
-    view_permission = permission_smart_link_edit
 
     def get_extra_context(self):
         return {
@@ -234,7 +234,7 @@ class SmartLinkEditView(SingleObjectEditView):
 
 
 class SmartLinkConditionListView(SingleObjectListView):
-    view_permission = permission_smart_link_edit
+    object_permission = permission_smart_link_edit
 
     def get_extra_context(self):
         return {