diff --git a/lib/WeBWorK/ContentGenerator.pm b/lib/WeBWorK/ContentGenerator.pm
index 2bd7756686..0ce2375bae 100644
--- a/lib/WeBWorK/ContentGenerator.pm
+++ b/lib/WeBWorK/ContentGenerator.pm
@@ -486,6 +486,7 @@ sub links ($c) {
 	my $setID         = $c->stash('setID');
 	my $problemID     = $c->stash('problemID');
 	my $achievementID = $c->stash('achievementID');
+	my $globalSetID   = defined $setID ? $setID =~ s/,v\d+$//r : undef;
 
 	# Determine if navigation is restricted for this user.
 	my $restricted_navigation = $authen->was_verified && !$authz->hasPermissions($userID, 'navigation_allowed');
@@ -500,9 +501,13 @@ sub links ($c) {
 	if ($authen->was_verified) {
 		if (defined $setID && $db->existsUserSet($eUserID, $setID)) {
 			$problemID = undef unless (defined $problemID && $db->existsUserProblem($eUserID, $setID, $problemID));
-		} else {
+		} elsif (defined $globalSetID && $db->existsGlobalSet($globalSetID)) {
 			$setID     = undef;
 			$problemID = undef;
+		} else {
+			$setID       = undef;
+			$globalSetID = undef;
+			$problemID   = undef;
 		}
 	}
 
@@ -543,7 +548,8 @@ sub links ($c) {
 		eUserID               => $eUserID,
 		urlUserID             => $c->stash('userID'),
 		setID                 => $setID,
-		prettySetID           => format_set_name_display($setID // ''),
+		globalSetID           => $globalSetID,
+		prettySetID           => format_set_name_display($setID // $globalSetID // ''),
 		problemID             => $problemID,
 		prettyProblemID       => $prettyProblemID,
 		achievementID         => $achievementID,
diff --git a/templates/ContentGenerator/Base/links.html.ep b/templates/ContentGenerator/Base/links.html.ep
index 171206b58b..e7cd7431d6 100644
--- a/templates/ContentGenerator/Base/links.html.ep
+++ b/templates/ContentGenerator/Base/links.html.ep
@@ -125,14 +125,14 @@
 			% # Sets Manager
 			<li class="list-group-item nav-item"><%= $makelink->('instructor_set_list') %></li>
 			% # Editor link.  Only shown for non-versioned sets
-			% if (defined $setID && $setID !~ /,v\d+$/) {
+			% if (defined $globalSetID || defined $setID && $setID !~ /,v\d+$/) {
 				<li class="list-group-item nav-item">
 					<ul class="nav flex-column">
 						<li class="nav-item">
 							<%= $makelink->(
 								'instructor_set_detail',
 								text       => $prettySetID,
-								captures   => { setID => $setID },
+								captures   => { setID => $globalSetID // $setID },
 								link_attrs => { dir => 'ltr' }
 							); %>
 						</li>
@@ -221,7 +221,7 @@
 			% # Statistics
 			<li class="list-group-item nav-item">
 				<%= $makelink->('instructor_statistics') %>
-				% if (defined $setID) {
+				% if (defined $setID || defined $globalSetID) {
 					<ul class="nav flex-column">
 						<li class="nav-item" dir="ltr">
 							<%= $makelink->(
@@ -252,7 +252,7 @@
 			</li>
 			% # Student Progress
 			<li class="list-group-item nav-item"><%= $makelink->('instructor_progress') %>
-				% if ($userID ne $eUserID || defined $setID || defined $urlUserID) {
+				% if ($userID ne $eUserID || defined $setID || defined $globalSetID || defined $urlUserID) {
 					<ul class="nav flex-column">
 						% if (defined $urlUserID) {
 							<li class="nav-item">
@@ -276,7 +276,7 @@
 								) %>
 							</li>
 						% }
-						% if (defined $setID) {
+						% if (defined $setID || defined $globalSetID) {
 							<li class="nav-item" dir="ltr">
 								<%= $makelink->(
 									'instructor_set_progress',