diff --git a/app/views/issues/_action_menu.html.erb b/app/views/issues/_action_menu.html.erb
index b535fae..e149cbb 100644
--- a/app/views/issues/_action_menu.html.erb
+++ b/app/views/issues/_action_menu.html.erb
@@ -1,5 +1,6 @@
 <div class="contextual">
-<%= link_to l(:button_edit), edit_issue_path(@issue), :onclick => 'showAndScrollTo("update", "issue_notes"); return false;', :class => 'icon icon-edit', :accesskey => accesskey(:edit) if @issue.editable? %>
+<%= link_to l(:button_add_notes), issue_path(@issue), :onclick => 'showAndScrollTo("update", "issue_notes"); return false;', :class =>'icon icon-comment' if User.current.allowed_to?(:add_issue_notes, @project) %>
+<%= link_to l(:button_edit), edit_issue_path(@issue), :onclick => 'showAndScrollTo("edit_issue", "issue_notes"); $("#cancel_edit_issue").show(); $("#edit_issue_header").show(); $("#add_notes_header").hide(); return false;', :class => 'icon icon-edit', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:edit_issues, @project) %>
 <%= link_to l(:button_log_time), new_issue_time_entry_path(@issue), :class => 'icon icon-time-add' if User.current.allowed_to?(:log_time, @project) %>
 <%= watcher_link(@issue, User.current) %>
 <%= link_to l(:button_copy), project_copy_issue_path(@project, @issue), :class => 'icon icon-copy' if User.current.allowed_to?(:copy_issues, @project) && Issue.allowed_target_projects.any? %>
diff --git a/app/views/issues/_edit.html.erb b/app/views/issues/_edit.html.erb
index 67e3324..0ac1303 100644
--- a/app/views/issues/_edit.html.erb
+++ b/app/views/issues/_edit.html.erb
@@ -2,6 +2,7 @@
     <%= error_messages_for 'issue', 'time_entry' %>
     <%= render :partial => 'conflict' if @conflict %>
     <div class="box">
+    <div id="edit_issue" style="display:none;">
     <% if @issue.attributes_editable? %>
         <fieldset class="tabular"><legend><%= l(:label_change_properties) %></legend>
         <div id="all_attributes">
@@ -27,6 +28,7 @@
         <% end %>
     </fieldset>
     <% end %>
+    </div>
     <% if @issue.notes_addable? %>
       <fieldset><legend><%= l(:field_notes) %></legend>
       <%= f.text_area :notes, :cols => 60, :rows => 10, :class => 'wiki-edit', :no_label => true %>
@@ -49,7 +51,7 @@
     <%= hidden_field_tag 'last_journal_id', params[:last_journal_id] || @issue.last_journal_id %>
     <%= submit_tag l(:button_submit) %>
     <%= preview_link preview_edit_issue_path(:project_id => @project, :id => @issue), 'issue-form' %>
-    | <%= link_to l(:button_cancel), {}, :onclick => "$('#update').hide(); return false;" %>
+    <span id="cancel_edit_issue" style="display:none;">| <%= link_to l(:button_cancel), issue_path(@issue) %></span>
 
     <%= hidden_field_tag 'prev_issue_id', @prev_issue_id if @prev_issue_id %>
     <%= hidden_field_tag 'next_issue_id', @next_issue_id if @next_issue_id %>
diff --git a/app/views/issues/edit.html.erb b/app/views/issues/edit.html.erb
index da80a08..58359e2 100644
--- a/app/views/issues/edit.html.erb
+++ b/app/views/issues/edit.html.erb
@@ -3,4 +3,9 @@
 <%= render :partial => 'edit' %>
 <% content_for :header_tags do %>
     <%= robot_exclusion_tag %>
+    <script>
+    //<![CDATA[
+    $(window).load(function(){ $("#edit_issue").show(); $("#cancel_edit_issue").show(); return false; });
+    //]]>
+    </script>
 <% end %>
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 2cbff32..87fd4aa 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -110,6 +110,7 @@ end %>
 <% end %>
 
 </div>
+<%= render :partial => 'action_menu' %>
 
 <% if @changesets.present? %>
 <div id="issue-changesets">
@@ -125,14 +126,11 @@ end %>
 </div>
 <% end %>
 
-
-<div style="clear: both;"></div>
-<%= render :partial => 'action_menu' %>
-
 <div style="clear: both;"></div>
 <% if @issue.editable? %>
-  <div id="update" style="display:none;">
-  <h3><%= l(:button_edit) %></h3>
+  <div id="update">
+  <h3 id="edit_issue_header" style="display:none;"><%= l(:button_edit) %></h3>
+  <h4 id="add_notes_header"><%= l(:button_add_notes) %></h4>
   <%= render :partial => 'edit' %>
   </div>
 <% end %>
diff --git a/app/views/journals/new.js.erb b/app/views/journals/new.js.erb
index cd6ab0d..b7f11e5 100644
--- a/app/views/journals/new.js.erb
+++ b/app/views/journals/new.js.erb
@@ -6,5 +6,5 @@ $('#issue_notes').val("<%= raw escape_javascript(@content) %>");
 $('#issue_private_notes').prop('checked', true);
 <% end %>
 
-showAndScrollTo("update", "notes");
-$('#notes').scrollTop = $('#notes').scrollHeight - $('#notes').clientHeight;
+showAndScrollTo("update", "issue_notes");
+$('#issue_notes').scrollTop = $('#issue_notes').scrollHeight - $('#issue_notes').clientHeight;
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a6501c3..afde6d5 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1013,6 +1013,7 @@ en:
   button_edit: Edit
   button_edit_associated_wikipage: "Edit associated Wiki page: %{page_title}"
   button_add: Add
+  button_add_notes: Add notes
   button_change: Change
   button_apply: Apply
   button_clear: Clear