diff --git a/app/Ninja/Datatables/ProposalCategoryDatatable.php b/app/Ninja/Datatables/ProposalCategoryDatatable.php
index c2620e9eca3b..53d44b8509a8 100644
--- a/app/Ninja/Datatables/ProposalCategoryDatatable.php
+++ b/app/Ninja/Datatables/ProposalCategoryDatatable.php
@@ -17,7 +17,11 @@ class ProposalCategoryDatatable extends EntityDatatable
             [
                 'name',
                 function ($model) {
-                    return $model->name;
+                    if (! Auth::user()->can('editByOwner', [ENTITY_PROPOSAL_CATEGORY, $model->user_id])) {
+                        return $model->name;
+                    }
+
+                    return link_to("proposals/categories/{$model->public_id}/edit", $model->name)->toHtml();
                 },
             ],
         ];
diff --git a/app/Ninja/Datatables/ProposalSnippetDatatable.php b/app/Ninja/Datatables/ProposalSnippetDatatable.php
index 1ae58cd604b0..54df09c25be6 100644
--- a/app/Ninja/Datatables/ProposalSnippetDatatable.php
+++ b/app/Ninja/Datatables/ProposalSnippetDatatable.php
@@ -15,13 +15,13 @@ class ProposalSnippetDatatable extends EntityDatatable
     {
         return [
             [
-                'proposal',
+                'name',
                 function ($model) {
                     if (! Auth::user()->can('editByOwner', [ENTITY_PROPOSAL_SNIPPET, $model->user_id])) {
-                        return $model->proposal;
+                        return $model->name;
                     }
 
-                    return link_to("proposals/snippets/{$model->public_id}/edit", $model->proposal)->toHtml();
+                    return link_to("proposals/snippets/{$model->public_id}/edit", $model->name)->toHtml();
                 },
             ],
             [
diff --git a/app/Ninja/Repositories/ProposalSnippetRepository.php b/app/Ninja/Repositories/ProposalSnippetRepository.php
index 563c7467674e..d8527d4c3cad 100644
--- a/app/Ninja/Repositories/ProposalSnippetRepository.php
+++ b/app/Ninja/Repositories/ProposalSnippetRepository.php
@@ -26,7 +26,7 @@ class ProposalSnippetRepository extends BaseRepository
                 ->leftjoin('proposal_categories', 'proposal_categories.id', '=', 'proposal_snippets.proposal_category_id')
                 ->where('proposal_snippets.account_id', '=', Auth::user()->account_id)
                 ->select(
-                    'proposal_snippets.name as proposal',
+                    'proposal_snippets.name',
                     'proposal_snippets.public_id',
                     'proposal_snippets.user_id',
                     'proposal_snippets.deleted_at',
diff --git a/resources/views/proposals/categories/edit.blade.php b/resources/views/proposals/categories/edit.blade.php
index 1dc61f475a3c..fc338c90afab 100644
--- a/resources/views/proposals/categories/edit.blade.php
+++ b/resources/views/proposals/categories/edit.blade.php
@@ -34,7 +34,7 @@
 
 
 	<center class="buttons">
-        {!! Button::normal(trans('texts.cancel'))->large()->asLinkTo(HTMLUtils::previousUrl('/expense_categories'))->appendIcon(Icon::create('remove-circle')) !!}
+        {!! Button::normal(trans('texts.cancel'))->large()->asLinkTo(HTMLUtils::previousUrl('/proposals/categories'))->appendIcon(Icon::create('remove-circle')) !!}
         {!! Button::success(trans('texts.save'))->submit()->large()->appendIcon(Icon::create('floppy-disk')) !!}
 	</center>