diff --git a/client/html/post.tpl b/client/html/post.tpl
index d6d30302..f9779408 100644
--- a/client/html/post.tpl
+++ b/client/html/post.tpl
@@ -3,7 +3,11 @@
         <nav class='buttons'>
             <article class='next-post'>
                 <% if (ctx.nextPostId) { %>
-                    <a href='/post/<%= ctx.nextPostId %>'>
+                    <% if (ctx.searchQuery && ctx.searchQuery.text) { %>
+                        <a href='/post/<%= ctx.nextPostId %>/text=<%= ctx.searchQuery.text %>'>
+                    <% } else { %>
+                        <a href='/post/<%= ctx.nextPostId %>'>
+                    <% } %>
                 <% } else { %>
                     <a class='inactive'>
                 <% } %>
@@ -13,7 +17,11 @@
             </article>
             <article class='previous-post'>
                 <% if (ctx.prevPostId) { %>
-                    <a href='/post/<%= ctx.prevPostId %>'>
+                    <% if (ctx.searchQuery && ctx.searchQuery.text) { %>
+                        <a href='/post/<%= ctx.prevPostId %>/text=<%= ctx.searchQuery.text %>'>
+                    <% } else { %>
+                        <a href='/post/<%= ctx.prevPostId %>'>
+                    <% } %>
                 <% } else { %>
                     <a class='inactive'>
                 <% } %>
@@ -29,7 +37,11 @@
                     </a>
                 <% } else { %>
                     <% if (ctx.canEditPosts) { %>
-                        <a href='/post/<%= ctx.post.id %>/edit'>
+                        <% if (ctx.searchQuery && ctx.searchQuery.text) { %>
+                            <a href='/post/<%= ctx.post.id %>/edit/text=<%= ctx.searchQuery.text %>'>
+                        <% } else { %>
+                            <a href='/post/<%= ctx.post.id %>/edit'>
+                        <% } %>
                     <% } else { %>
                         <a class='inactive'>
                     <% } %>
diff --git a/client/html/posts_page.tpl b/client/html/posts_page.tpl
index 8024be02..96e1b524 100644
--- a/client/html/posts_page.tpl
+++ b/client/html/posts_page.tpl
@@ -4,7 +4,11 @@
             <% for (let post of ctx.results) { %>
                 <li>
                     <% if (ctx.canViewPosts) { %>
-                        <a href='/post/<%= post.id %>' title='@<%= post.id %> (<%= post.type %>)&#10;&#10;Tags: <%= post.tags.map(tag => '#' + tag).join(' ') %>'>
+                        <% if (ctx.searchQuery && ctx.searchQuery.text) { %>
+                            <a href='/post/<%= post.id %>/text=<%= ctx.searchQuery.text %>' title='@<%= post.id %> (<%= post.type %>)&#10;&#10;Tags: <%= post.tags.map(tag => '#' + tag).join(' ') %>'>
+                        <% } else { %>
+                            <a href='/post/<%= post.id %>' title='@<%= post.id %> (<%= post.type %>)&#10;&#10;Tags: <%= post.tags.map(tag => '#' + tag).join(' ') %>'>
+                        <% } %>
                     <% } else { %>
                         <a>
                     <% } %>
diff --git a/client/js/controllers/post_controller.js b/client/js/controllers/post_controller.js
index a6b2430f..cc87f289 100644
--- a/client/js/controllers/post_controller.js
+++ b/client/js/controllers/post_controller.js
@@ -10,13 +10,14 @@ const PostView = require('../views/post_view.js');
 const EmptyView = require('../views/empty_view.js');
 
 class PostController {
-    constructor(id, editMode) {
+    constructor(id, editMode, searchQuery) {
         topNavigation.activate('posts');
 
         Promise.all([
                 Post.get(id),
                 api.get(`/post/${id}/around?fields=id&query=` +
-                    this._decorateSearchQuery('')),
+                    this._decorateSearchQuery(
+                        searchQuery ? searchQuery.text : '')),
         ]).then(responses => {
             const [post, aroundResponse] = responses;
             this._post = post;
@@ -28,6 +29,7 @@ class PostController {
                 canEditPosts: api.hasPrivilege('posts:edit'),
                 canListComments: api.hasPrivilege('comments:list'),
                 canCreateComments: api.hasPrivilege('comments:create'),
+                searchQuery: searchQuery,
             });
             if (this._view.sidebarControl) {
                 this._view.sidebarControl.addEventListener(
@@ -138,10 +140,17 @@ class PostController {
 }
 
 module.exports = router => {
-    router.enter('/post/:id', (ctx, next) => {
-        ctx.controller = new PostController(ctx.params.id, false);
-    });
-    router.enter('/post/:id/edit', (ctx, next) => {
-        ctx.controller = new PostController(ctx.params.id, true);
-    });
+    router.enter('/post/:id/edit/:query?',
+        (ctx, next) => { misc.parseSearchQueryRoute(ctx, next); },
+        (ctx, next) => {
+            ctx.controller = new PostController(
+                ctx.params.id, true, ctx.searchQuery);
+        });
+    router.enter(
+        '/post/:id/:query?',
+        (ctx, next) => { misc.parseSearchQueryRoute(ctx, next); },
+        (ctx, next) => {
+            ctx.controller = new PostController(
+                ctx.params.id, false, ctx.searchQuery);
+        });
 };