diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 35a5ced5f..8de88f478 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -393,20 +393,17 @@ nav.primary {
       border-top-color: #ccc;
     }
   }
-}
 
-.site-index #view_tab,
-.changeset-list #history_tab,
-.site-export #export_tab,
-.site-edit #edit_tab {
-  background-color: $green;
+  > ul li.current {
+    background-color: $green;
 
-  .tab {
-    color: #fff;
-  }
+    .tab {
+      color: #fff;
+    }
 
-  .caret {
-    border-top-color: #fff;
+    .caret {
+      border-top-color: #fff;
+    }
   }
 }
 
@@ -423,6 +420,10 @@ nav.secondary {
     padding: 5px 5px;
   }
 
+  > ul li.current a {
+    color: darken($darkgrey, 25%);
+  }
+
   .user-menu {
     $border: 1px solid $grey;
 
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 4765cb35b..f74d5cbf2 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -96,4 +96,8 @@ module ApplicationHelper
   def body_class
     [params[:controller], "#{params[:controller]}-#{params[:action]}", @extra_body_class].compact.join(" ")
   end
+
+  def current_page_class(path)
+    :current if current_page?(path)
+  end
 end
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index c4f2ebad6..5a72eeeb3 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -7,9 +7,9 @@
   </h1>
   <nav class='primary'>
     <ul>
-      <li id="view_tab">
+      <li id="view_tab" class="<%= current_page_class(root_path) %>">
         <%= link_to t('layouts.view'), root_path, :class => 'tab geolink llz layers' %>
-      </li><li id="edit_tab" class="dropdown">
+      </li><li id="edit_tab" class="dropdown <%= current_page_class(edit_path) %>">
       <%= link_to t('layouts.edit'), edit_path, :class => "tab geolink llz object",
                   :id => 'editanchor',
                   :data => { :editor => preferred_editor }
@@ -24,19 +24,19 @@
           </li>
         <% end %>
       </ul>
-      </li><li id="history_tab">
+      </li><li id="history_tab" class="<%= current_page_class(browse_changesets_path) %>">
         <%= link_to t('layouts.history'), browse_changesets_path, :class => 'tab geolink llz' %>
-      </li><li id="export_tab">
+      </li><li id="export_tab" class="<%= current_page_class(export_path) %>">
         <%= link_to t('layouts.export'), export_path, :class => 'tab geolink llz' %>
       </li>
     </ul>
   </nav>
   <nav class='secondary'>
     <ul>
-      <li><%= link_to t('layouts.gps_traces'), traces_path %></li>
-      <li><%= link_to t('layouts.user_diaries'), diary_path %></li>
-      <li><%= link_to t('layouts.help'), help_path %></li>
-      <li><%= link_to t('layouts.about'), about_path %></li>
+      <li class="<%= current_page_class(traces_path) %>"><%= link_to t('layouts.gps_traces'), traces_path %></li>
+      <li class="<%= current_page_class(diary_path) %>"><%= link_to t('layouts.user_diaries'), diary_path %></li>
+      <li class="<%= current_page_class(help_path) %>"><%= link_to t('layouts.help'), help_path %></li>
+      <li class="<%= current_page_class(about_path) %>"><%= link_to t('layouts.about'), about_path %></li>
     </ul>
     <% if @user %>
       <div class='dropdown user-menu'>