diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index 10b8cba8..efeab030 100644
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -56,6 +56,7 @@ class NotesController < ApplicationController
   def destroy
     @note = current_user.notes.find(params['id'])
     @note.destroy
+    set_source_view
 
     respond_to do |format|
       format.html
diff --git a/app/views/notes/destroy.js.erb b/app/views/notes/destroy.js.erb
index 6c067755..6bd42761 100644
--- a/app/views/notes/destroy.js.erb
+++ b/app/views/notes/destroy.js.erb
@@ -1,6 +1,13 @@
-remove_deleted_note(<%=@note.id%>);
-TracksPages.set_page_badge(<%=@down_count%>);
 TracksPages.page_inform("<%=  t('notes.deleted_note', :id => @note.id)%>");
+<%
+if @source_view == 'note' %>
+    redirect_to("<%= project_path(@note.project) -%>")
+<% else %>
+    remove_deleted_note(<%=@note.id%>);
+    TracksPages.set_page_badge(<%=@down_count%>);
+<%
+end
+%>
 
 function remove_deleted_note(id) {
   TracksPages.slide_up_and_remove('div#note-'+id+'-wrapper');