diff --git a/app/views/js/templates/_story.js.erb b/app/views/js/templates/_story.js.erb
deleted file mode 100644
index 9e6ec6f65..000000000
--- a/app/views/js/templates/_story.js.erb
+++ /dev/null
@@ -1,54 +0,0 @@
-<script type="text/template" id="story-template">
-  <div class="row story-preview">
-    <div class="col-md-3">
-      <div class="story-starred">
-        <i class="fa {{ if(is_starred) { }}fa-star{{ } else { }}fa-star-o{{ } }}"></i>
-      </div>
-      <p class="blog-title">
-        {{= source }}
-      </p>
-    </div>
-    <div class="col-md-9">
-      <p class="story-details">
-        <span class="story-title">
-          {{= headline }}
-        </span>
-        <span class="story-lead">
-          &mdash; {{= lead }}
-        </span>
-      </p>
-    </div>
-  </div>
-
-  <div class="story-body-container">
-    <div class="story-body">
-      <h1>
-        <a href="{{= permalink }}">{{= title }}</a>
-        {{ if (enclosure_url) { }}
-          <a class="story-enclosure" target="_blank" href="{{= enclosure_url }}">
-            <i class="fa fa-download"></i>
-          </a>
-        {{ } }}
-      </h1>
-      {{= body }}
-    </div>
-    <div class="row story-actions-container">
-      <div class="float-start">
-        <span class="story-published">
-          {{= pretty_date }}
-        </span>
-      </div>
-      <div class="float-end story-actions">
-        <div class="story-keep-unread">
-          <i class="fa {{ if(keep_unread) { }}fa-check{{ } else { }}fa-square-o{{ } }}"></i> <%= I18n.t('stories.keep_unread') %>
-        </div>
-        <div class="story-starred">
-          <i class="fa {{ if(is_starred) { }}fa-star{{ } else { }}fa-star-o{{ } }}"></i>
-        </div>
-        <a class="story-permalink" target="_blank" href="{{= permalink }}">
-          <i class="fa fa-external-link"></i>
-        </a>
-      </div>
-    </div>
-  </div>
-</script>
diff --git a/spec/system/keyboard_shortcuts_spec.rb b/spec/system/keyboard_shortcuts_spec.rb
index 9051acfb4..c2f9602a0 100644
--- a/spec/system/keyboard_shortcuts_spec.rb
+++ b/spec/system/keyboard_shortcuts_spec.rb
@@ -27,6 +27,24 @@ def create_stories_and_visit
     expect(page).to have_css("li.story.open", count: 1)
   end
 
+  it "wraps the cursor to the first story when pressing j at the end" do
+    login_as(default_user)
+    create_stories_and_visit
+
+    send_keys("j", "j", "j")
+
+    expect(find("li.story.open")).to have_text("First Story")
+  end
+
+  it "wraps the cursor to the last story when pressing k at the top" do
+    login_as(default_user)
+    create_stories_and_visit
+
+    send_keys("j", "k")
+
+    expect(find("li.story.open")).to have_text("Second Story")
+  end
+
   it "moves cursor without opening with n" do
     login_as(default_user)
     create_stories_and_visit
diff --git a/spec/system/stories_index_spec.rb b/spec/system/stories_index_spec.rb
index 5b3b79183..bd4ab30fe 100644
--- a/spec/system/stories_index_spec.rb
+++ b/spec/system/stories_index_spec.rb
@@ -160,6 +160,30 @@ def open_story_and_find_unread_icon(story_title)
     expect(page).to have_css(".story.read")
   end
 
+  it "persists read state across page reload", :aggregate_failures do
+    create(:story, title: "My Story")
+    login_as(default_user)
+    visit news_path
+
+    find(".story-preview", text: "My Story").click
+    expect(page).to have_css(".story.read")
+
+    visit news_path
+    expect(page).to have_no_text("My Story")
+  end
+
+  it "marks a story as read when opened in a background tab with ctrl-click",
+     :aggregate_failures do
+    create(:story, title: "My Story")
+    login_as(default_user)
+    visit news_path
+
+    find(".story-preview", text: "My Story").click(:control)
+
+    expect(page.windows.size).to eq(2)
+    expect(page).to have_css(".story.read")
+  end
+
   it "displays stories in newest-first order by default" do
     create(:story, title: "Older Story", published: 2.days.ago)
     create(:story, title: "Newer Story", published: 1.day.ago)
@@ -207,6 +231,18 @@ def open_story_and_find_unread_icon(story_title)
     expect(page).to have_title("(1)")
   end
 
+  it "clears the unread count in the title when the last story is read",
+     :aggregate_failures do
+    create(:story, title: "My Story")
+    login_as(default_user)
+    visit news_path
+    expect(page).to have_title("(1)")
+
+    find(".story-preview", text: "My Story").click
+
+    expect(page).to have_no_title("(1)")
+  end
+
   it "allows viewing a story with hot keys" do
     create(:story, title: "My Story", body: "My Body")
     login_as(default_user)