diff --git a/js/script.js b/js/script.js
index fbec51a..0e3b411 100644
--- a/js/script.js
+++ b/js/script.js
@@ -308,6 +308,7 @@ View.prototype = {
                 if (self._notes.length() > 0) {
                     $(".notes-grid").isotope('remove', note.parent())
                                     .isotope('layout');
+                    self.showAll();
                     self.renderNavigation();
                 } else {
                     self.render();
diff --git a/templates/part.navigation.php b/templates/part.navigation.php
index 90ac483..baf06ca 100644
--- a/templates/part.navigation.php
+++ b/templates/part.navigation.php
@@ -2,8 +2,8 @@
 <div style="display:none" id="new-note-string"><?php p($l->t('New note')); ?></div>
 
 <script id="navigation-tpl" type="text/x-handlebars-template">
-	<li id="all-notes"><a href="#" class="icon-home svg"><?php p($l->t('All notes')); ?></a></li>
 	<li id="new-note"><a href="#" class="icon-add svg"><?php p($l->t('Add note')); ?></a></li>
+	<li id="all-notes"><a href="#" class="icon-home svg"><?php p($l->t('All notes')); ?></a></li>
 
 	<li class="collapsible open">
 		<button class="collapse"></button>