diff --git a/app/views/shared/_sidebar.html.erb b/app/views/shared/_sidebar.html.erb
index 9923c8896..649557a4f 100644
--- a/app/views/shared/_sidebar.html.erb
+++ b/app/views/shared/_sidebar.html.erb
@@ -13,23 +13,27 @@
     </div>
 
     <div class="tree">
-      <% if !project_page? %>
       <ul>
-        <li>
-          <span class="tree-link line-wrap">
-            <i></i>
-              <%= link_to @project.name,
-                          project_action_to_link_to(@project),
-                          title: @project.name %>
-          </span>
-          <%= render partial: 'shared/sidebar/experiments',
-                    locals: { project: @project } %>
-        </li>
+        <% if project_page? %>
+          <li class="active">
+            <span class="tree-link line-wrap">
+              <i></i>
+              <span title="<%= @project.name %>"><%= @project.name %></span>
+            </span>
+          </li>
+        <% else %>
+          <li>
+            <span class="tree-link line-wrap">
+              <i></i>
+                <%= link_to @project.name,
+                            project_action_to_link_to(@project),
+                            title: @project.name %>
+            </span>
+          </li>
+        <% end %>
+        <%= render partial: 'shared/sidebar/experiments',
+                  locals: { project: @project } %>
       </ul>
-      <% else %>
-      <%= render partial: 'shared/sidebar/experiments',
-                locals: { project: @project } %>
-      <% end %>
     </div>
   </div>
 <% end %>
diff --git a/app/views/shared/sidebar/_experiments.html.erb b/app/views/shared/sidebar/_experiments.html.erb
index a2cd2e46f..588f0ad8e 100644
--- a/app/views/shared/sidebar/_experiments.html.erb
+++ b/app/views/shared/sidebar/_experiments.html.erb
@@ -1,15 +1,15 @@
 <ul>
   <% if project.active_experiments.present? then %>
-    <% if experiment_page? %>
-      <li class="active">
-        <span class="tree-link line-wrap">
-          <i></i>
-          <span title="<%= @experiment.name %>"><%= @experiment.name %></span>
-        </span>
-        <%= render partial: 'shared/sidebar/my_modules', locals: { experiment: @experiment } %>
-      </li>
-    <% else %>
-      <% project.active_experiments.each do |experiment| %>
+    <% project.active_experiments.each do |experiment| %>
+      <% if experiment_page? && experiment == @experiment %>
+        <li class="active">
+          <span class="tree-link line-wrap">
+            <i></i>
+            <span title="<%= @experiment.name %>"><%= @experiment.name %></span>
+          </span>
+          <%= render partial: 'shared/sidebar/my_modules', locals: { experiment: @experiment } %>
+        </li>
+      <% else %>
         <li>
           <span class="tree-link line-wrap">
             <i></i>