diff --git a/assets/js/app.js b/assets/js/app.js
index b1c4b9c..57aa789 100644
--- a/assets/js/app.js
+++ b/assets/js/app.js
@@ -5,7 +5,7 @@
     var queue_length = 5;
 
 
-    function switch_status(item_id)
+    function switch_status(item_id, hide)
     {
         var request = new XMLHttpRequest();
 
@@ -18,7 +18,7 @@
                 if (response.status == "read" || response.status == "unread") {
 
                     find_next_item();
-                    remove_item(response.item_id);
+                    if (hide) remove_item(response.item_id);
                 }
             }
         }
@@ -193,23 +193,27 @@
     function remove_item(item_id)
     {
         var item = document.getElementById("item-" + item_id);
-        if (item) item.parentNode.removeChild(item);
 
-        var container = document.getElementById("page-counter");
+        if (item) {
 
-        if (container) {
+            item.parentNode.removeChild(item);
 
-            counter = parseInt(container.textContent.trim(), 10) - 1;
+            var container = document.getElementById("page-counter");
 
-            if (counter == 0) {
+            if (container) {
 
-                window.location = "?action=feeds&nothing_to_read=1";
-            }
-            else {
+                counter = parseInt(container.textContent.trim(), 10) - 1;
 
-                container.textContent = counter + " ";
-                document.title = "miniflux (" + counter + ")";
-                document.getElementById("nav-counter").textContent = "(" + counter + ")";
+                if (counter == 0) {
+
+                    window.location = "?action=feeds&nothing_to_read=1";
+                }
+                else {
+
+                    container.textContent = counter + " ";
+                    document.title = "miniflux (" + counter + ")";
+                    document.getElementById("nav-counter").textContent = "(" + counter + ")";
+                }
             }
         }
     }
@@ -221,7 +225,10 @@
 
         if (link) {
 
-            if (is_listing()) mark_as_read(link.getAttribute("data-item-id"));
+            if (is_listing() && link.getAttribute("data-hide")) {
+                mark_as_read(link.getAttribute("data-item-id"));
+            }
+
             link.removeAttribute("data-action");
             link.click();
         }
@@ -268,11 +275,14 @@
     function change_item_status()
     {
         if (is_listing() && ! document.getElementById("current-item")) {
-            document.querySelector("article").id = "current-item";
+            find_next_item();
         }
 
         var item = document.getElementById("current-item");
-        if (item) switch_status(item.getAttribute("data-item-id"));
+
+        if (item) {
+            switch_status(item.getAttribute("data-item-id"), item.getAttribute("data-hide"));
+        }
     }
 
 
diff --git a/templates/bookmarks.php b/templates/bookmarks.php
index 86afec0..899bc2a 100644
--- a/templates/bookmarks.php
+++ b/templates/bookmarks.php
@@ -8,13 +8,14 @@
         <h2><?= t('Bookmarks') ?> (<?= $nb_items ?>)</h2>
     </div>
 
-    <section class="items">
+    <section class="items" id="listing">
     <?php foreach ($items as $item): ?>
         <?php $item_id = Model\encode_item_id($item['id']) ?>
         <article id="item-<?= $item_id ?>" data-item-id="<?= $item_id ?>">
             <h2>
                 <a
                     href="?action=show&amp;id=<?= $item_id ?>"
+                    data-item-id="<?= $item_id ?>"
                     id="open-<?= $item_id ?>"
                 >
                     <?= Helper\escape($item['title']) ?>
diff --git a/templates/history.php b/templates/history.php
index d4a2093..cf0b50e 100644
--- a/templates/history.php
+++ b/templates/history.php
@@ -12,11 +12,12 @@
     <section class="items" id="listing">
     <?php foreach ($items as $item): ?>
         <?php $item_id = Model\encode_item_id($item['id']) ?>
-        <article id="item-<?= $item_id ?>" data-item-id="<?= $item_id ?>" data-item-page="<?= $menu ?>">
+        <article id="item-<?= $item_id ?>" data-item-id="<?= $item_id ?>" data-item-page="<?= $menu ?>" data-hide="true">
             <h2>
                 <?= $item['bookmark'] ? '★ ' : '' ?>
                 <a
                     href="?action=show&amp;id=<?= $item_id ?>"
+                    data-item-id="<?= $item_id ?>"
                     id="open-<?= $item_id ?>"
                 >
                     <?= Helper\escape($item['title']) ?>
@@ -28,7 +29,7 @@
                 <a href="?action=mark-item-unread&amp;id=<?= $item_id ?>&amp;offset=<?= $offset ?>"><?= t('mark as unread') ?></a> |
 
                 <?php if (! $item['bookmark']): ?>
-                    <a href="?action=bookmark&amp;value=1&amp;id=<?= $item_id ?>&amp;redirect=history&amp;offset=<?= $offset ?>"><?= t('bookmark') ?></a> |
+                    <a id="bookmark-<?= $item_id ?>" href="?action=bookmark&amp;value=1&amp;id=<?= $item_id ?>&amp;redirect=history&amp;offset=<?= $offset ?>"><?= t('bookmark') ?></a> |
                 <?php endif ?>
 
                 <a href="?action=mark-item-removed&amp;id=<?= $item_id ?>&amp;offset=<?= $offset ?>"><?= t('remove') ?></a> |
diff --git a/templates/unread_items.php b/templates/unread_items.php
index 13640a4..edb86ea 100644
--- a/templates/unread_items.php
+++ b/templates/unread_items.php
@@ -14,11 +14,12 @@
     <section class="items" id="listing">
     <?php foreach ($items as $item): ?>
         <?php $item_id = Model\encode_item_id($item['id']) ?>
-        <article id="item-<?= $item_id ?>" data-item-id="<?= $item_id ?>" data-item-page="<?= $menu ?>">
+        <article id="item-<?= $item_id ?>" data-item-id="<?= $item_id ?>" data-item-page="<?= $menu ?>" data-hide="true">
             <h2>
                 <?= $item['bookmark'] ? '★ ' : '' ?>
                 <a
                     href="?action=read&amp;id=<?= $item_id ?>"
+                    data-item-id="<?= $item_id ?>"
                     id="open-<?= $item_id ?>"
                 >
                     <?= Helper\escape($item['title']) ?>
@@ -45,6 +46,7 @@
                     target="_blank"
                     data-item-id="<?= $item_id ?>"
                     data-action="mark-read"
+                    data-hide="true"
                 >
                     <?= t('original link') ?>
                 </a>