--- a/TODO.txt
+++ b/TODO.txt
@@ -1,5 +1,4 @@
 new-ui:
-* Make the project tabs active styled depending on context
 * Fix menu bottom spacing issue in safari
 * Clone stats graph on repositories#index
 * divergence from mainline in +/-

--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -38,6 +38,20 @@ module ApplicationHelper
     end
   end
   
+  def submenu_selected_class_if_current?(section)
+    case section
+    when :overview
+     if %w[projects].include?(controller.controller_name )
+       return "selected"
+     end
+    when :repositories
+      if %w[repositories trees logs commits comitters comments merge_requests 
+            blobs committers].include?(controller.controller_name )
+        return "selected"
+      end
+    end
+  end
+  
   def link_to_with_selected(name, options = {}, html_options = nil)
     html_options = current_page?(options) ? {:class => "selected"} : nil
     link_to(name, options = {}, html_options)

--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -50,8 +50,14 @@
     <% if @project -%>
     <h2 id="project_title"><%= link_to h(@project.title), @project -%></h2>
     <ul id="submenu">
-      <li class="selected"><%= link_to "Overview", project_path(@project), :class => "round-tl-5 round-tr-5" -%></li>
-      <li><%= link_to "Repositories", project_repositories_path(@project), :class => "round-tl-5 round-tr-5" -%></li>
+      <li class="<%= submenu_selected_class_if_current?(:overview) -%>">
+        <%= link_to "Project Overview", 
+          project_path(@project), :class => "round-tl-5 round-tr-5" -%>
+      </li>
+      <li class="<%= submenu_selected_class_if_current?(:repositories) -%>">
+        <%= link_to "Repositories", 
+          project_repositories_path(@project), :class => "round-tl-5 round-tr-5" -%>
+      </li>
     </ul>
     <% end -%>
   </div>