diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 19864d4cf..e62630746 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -75,6 +75,8 @@
  - fix: relative links sent out in emails don't work properly
  - fix: macros not processed in HttpProxy template
     http://www.webgui.org/bugs/tracker/macro-not-working-i-httpproxy
+ - fix: navigation shows toolbar for users who can't edit it
+    http://www.webgui.org/bugs/tracker/navigation-shows-edit-button-to-users-without-permission
 
 7.3.21
  - fix: Self-deactivation doesn't show login screen after success
diff --git a/lib/WebGUI/Asset/Wobject/Navigation.pm b/lib/WebGUI/Asset/Wobject/Navigation.pm
index 6662f5403..c7f1cdbff 100644
--- a/lib/WebGUI/Asset/Wobject/Navigation.pm
+++ b/lib/WebGUI/Asset/Wobject/Navigation.pm
@@ -297,6 +297,8 @@ Returns a toolbar with a set of icons that hyperlink to functions that delete, e
 
 sub getToolbar {
 	my $self = shift;
+	return
+	    unless $self->canEdit;
 	if ($self->getToolbarState) {
 		my $returnUrl;
 		if ($self->session->asset) {