diff --git a/client/client.coffee b/client/client.coffee
index 8c8c7d7..0f118f6 100644
--- a/client/client.coffee
+++ b/client/client.coffee
@@ -120,6 +120,7 @@ Template.notelist.notelist = ->
 ###
 Template.notelist.events
   'click .close-note': -> notes.update @_id, $set: archived: yes
+  'click .edit-note': -> Router.go 'notes'
   'keypress #newNote': (e,template) ->
     if e.keyCode is 13 and template.find('#newNote').value isnt ""
       notes.insert
diff --git a/client/view/templates.html b/client/view/templates.html
index a17b86a..d64d21f 100644
--- a/client/view/templates.html
+++ b/client/view/templates.html
@@ -33,7 +33,7 @@
     {{#each notelist}}
     <a href="{{pathFor 'notes'}}" class="note list-group-item">
       <span class="note-content">
-        {{#if active}}<a role="button" href="{{pathFor 'notes'}}" class="edit-note close">
+        {{#if active}}<a role="button" class="edit-note close">
           <i class="fa fa-pencil-square-o"></i>
         </a>{{/if}}
         <b>{{title}}</b> <span class="note-desc">{{content}}</span>