diff --git a/blog.py b/blog.py
index deffb29d..e9484cb0 100644
--- a/blog.py
+++ b/blog.py
@@ -566,8 +566,7 @@ def htmlEditBlog(mediaInstance: bool,translate: {}, \
 
     if '?' in path:
         path=path.split('?')[0]
-    pathBase= \
-        path.replace('/editblogpost','')
+    pathBase=path
 
     editBlogImageSection ='    <div class="container">'
     editBlogImageSection+='      <label class="labels">'+translate['Image description']+'</label>'
diff --git a/daemon.py b/daemon.py
index 8f17c604..9368fd63 100644
--- a/daemon.py
+++ b/daemon.py
@@ -2372,6 +2372,7 @@ class PubServer(BaseHTTPRequestHandler):
 
             # Edit a blog post
             if authorized and \
+               '/tlblogs' in self.path and \
                '?editblogpost=' in self.path and \
                '?actor=' in self.path:
                 messageId=self.path.split('?editblogpost=')[1]
diff --git a/webinterface.py b/webinterface.py
index 6b97ce98..3ddebc52 100644
--- a/webinterface.py
+++ b/webinterface.py
@@ -2994,7 +2994,7 @@ def individualPostAsHtml(recentPostsCache: {},maxRecentPosts: int, \
         if isBlogPost(postJsonObject):
             if '/statuses/' in postJsonObject['object']['id']:
                 editStr+= \
-                    '<a href="/users/'+nickname+'?editblogpost='+ \
+                    '<a href="/users/'+nickname+'/tlblogs?editblogpost='+ \
                     postJsonObject['object']['id'].split('/statuses/')[1]+ \
                     '?actor='+actorNickname+ \
                     '" title="'+translate['Edit blog post']+'">'+ \