diff --git a/app/helpers/sidebar_helper.rb b/app/helpers/sidebar_helper.rb
index d1e13ebd2..7f2f82b41 100644
--- a/app/helpers/sidebar_helper.rb
+++ b/app/helpers/sidebar_helper.rb
@@ -10,9 +10,9 @@ module SidebarHelper
 
   def project_action_to_link_to(project)
     case action_name
-    when "samples"
+    when 'samples'
       return samples_project_path(project)
-    when "archive"
+    when 'archive', 'module_archive', 'experiment_archive'
       return experiment_archive_project_url(project)
     else
       return project_path(project)
@@ -20,19 +20,25 @@ module SidebarHelper
   end
 
   def experiment_action_to_link_to(experiment)
-    # TODO
-    canvas_experiment_path(experiment)
+    case action_name
+    when 'samples'
+      return samples_experiment_path(experiment)
+    when 'archive', 'module_archive', 'experiment_archive'
+      return module_archive_experiment_url(experiment)
+    else
+      return canvas_experiment_path(experiment)
+    end
   end
 
   def module_action_to_link_to(my_module)
     case action_name
-    when "results"
+    when 'results'
       return results_my_module_url(my_module)
-    when "activities"
+    when 'activities'
       return activities_my_module_url(my_module)
-    when "samples"
+    when 'samples'
       return samples_my_module_url(my_module)
-    when "archive", "module_archive"
+    when 'archive', 'module_archive', 'experiment_archive'
       return archive_my_module_url(my_module)
     else
       return protocols_my_module_url(my_module)
diff --git a/app/views/shared/_secondary_navigation.html.erb b/app/views/shared/_secondary_navigation.html.erb
index 7b68c2a2c..5e277ba42 100644
--- a/app/views/shared/_secondary_navigation.html.erb
+++ b/app/views/shared/_secondary_navigation.html.erb
@@ -99,35 +99,35 @@
           <% end %>
 
         <% elsif experiment_page? %>
-        <% if can_view_experiment_samples(@experiment) then %>
-          <li id="experiment-samples-nav-tab" class="<%= "active" if is_experiment_samples? %>">
-            <a href="<%= samples_experiment_url(@experiment) %>" title="<%=t "nav2.projects.samples" %>">
-              <span class="hidden-sm hidden-md"><%=t "nav2.projects.samples" %></span>
-              <span class="hidden-xs hidden-lg glyphicon glyphicon-tint"></span>
-            </a>
-          </li>
-        <% end %>
-          <% if can_view_experiment(@experiment) then %>
-            <li id="canvas-nav-tab" class="<%= "active" if is_experiment_canvas? %>">
-              <a href="<%= project_url(@project) %>" title="<%=t "nav2.experiments.canvas" %>">
-                <span class="hidden-sm hidden-md"><%=t "nav2.experiments.canvas" %></span>
-                <span class="hidden-xs hidden-lg glyphicon glyphicon-blackboard"></span>
+          <% if can_view_experiment_samples(@experiment) then %>
+            <li id="experiment-samples-nav-tab" class="<%= "active" if is_experiment_samples? %>">
+              <a href="<%= samples_experiment_url(@experiment) %>" title="<%=t "nav2.projects.samples" %>">
+                <span class="hidden-sm hidden-md"><%=t "nav2.projects.samples" %></span>
+                <span class="hidden-xs hidden-lg glyphicon glyphicon-tint"></span>
               </a>
             </li>
           <% end %>
-          <% if can_view_reports(@experiment.project) then %>
-            <li id="reports-nav-tab" class="<%= "active" if is_project_reports? %>">
-              <a href="<%= project_reports_url(@experiment.project) %>" title="<%=t "nav2.projects.reports" %>">
-                <span class="hidden-sm hidden-md"><%=t "nav2.projects.reports" %></span>
-                <span class="hidden-xs hidden-lg glyphicon glyphicon-list-alt"></span>
-              </a>
-            </li>
-          <% end %>
-          <% if can_view_experiment_archive(@experiment) then %>
-            <li id="project-archive-nav-tab" class="<%= "active" if is_experiment_archive? %>">
-              <a href="<%= module_archive_experiment_url(@experiment) %>"><span class="glyphicon glyphicon-briefcase"></span></a>
-            </li>
-          <% end %>
+            <% if can_view_experiment(@experiment) then %>
+              <li id="canvas-nav-tab" class="<%= "active" if is_experiment_canvas? %>">
+                <a href="<%= canvas_experiment_url(@experiment) %>" title="<%=t "nav2.experiments.canvas" %>">
+                  <span class="hidden-sm hidden-md"><%=t "nav2.experiments.canvas" %></span>
+                  <span class="hidden-xs hidden-lg glyphicon glyphicon-blackboard"></span>
+                </a>
+              </li>
+            <% end %>
+            <% if can_view_reports(@experiment.project) then %>
+              <li id="reports-nav-tab" class="<%= "active" if is_project_reports? %>">
+                <a href="<%= project_reports_url(@experiment.project) %>" title="<%=t "nav2.projects.reports" %>">
+                  <span class="hidden-sm hidden-md"><%=t "nav2.projects.reports" %></span>
+                  <span class="hidden-xs hidden-lg glyphicon glyphicon-list-alt"></span>
+                </a>
+              </li>
+            <% end %>
+            <% if can_view_experiment_archive(@experiment) then %>
+              <li id="project-archive-nav-tab" class="<%= "active" if is_experiment_archive? %>">
+                <a href="<%= module_archive_experiment_url(@experiment) %>"><span class="glyphicon glyphicon-briefcase"></span></a>
+              </li>
+            <% end %>
 
         <% elsif module_page? %>
           <% if can_view_module_protocols(@my_module) then %>