diff --git a/tracks/app/views/layouts/standard.rhtml b/tracks/app/views/layouts/standard.rhtml
index 2c888602..84cc58e3 100644
--- a/tracks/app/views/layouts/standard.rhtml
+++ b/tracks/app/views/layouts/standard.rhtml
@@ -34,8 +34,8 @@ window.onload=function(){
   </h1>
 </div>
 <div id="minilinks">
-	<%= link_to_function("Toggle notes", nil, {:accesskey => "S", :title => "Toggle all notes"}) do |page|
-		  page.select('.notes').each { |e| e.toggle }
+	<%= link_to_function("Toggle notes", nil, {:accesskey => "S", :title => "Toggle all notes", :id => "toggle-notes-nav"}) do |page|
+		  page.select('body .notes').each { |e| e.toggle }
 		end
 	-%>&nbsp;|&nbsp;
     <%= link_to "Logout (#{current_user.display_name}) »", logout_path %>
diff --git a/tracks/test/selenium/notes/toggle_notes.rsel b/tracks/test/selenium/notes/toggle_notes.rsel
new file mode 100644
index 00000000..337ebb06
--- /dev/null
+++ b/tracks/test/selenium/notes/toggle_notes.rsel
@@ -0,0 +1,5 @@
+setup :fixtures => :all
+login :as => 'admin'
+open "/notes"
+click_and_wait "css=#toggle-notes-nav"
+assert_element_present "body#notes"
diff --git a/tracks/test/selenium/project_detail/toggle_notes.rsel b/tracks/test/selenium/project_detail/toggle_notes.rsel
new file mode 100644
index 00000000..25898731
--- /dev/null
+++ b/tracks/test/selenium/project_detail/toggle_notes.rsel
@@ -0,0 +1,5 @@
+setup :fixtures => :all
+login :as => 'admin'
+open "/projects/1"
+click_and_wait "css=#toggle-notes-nav"
+assert_element_present "notes_todo_6"