diff --git a/daemon.py b/daemon.py
index 5925e5f29..3fc43f5de 100644
--- a/daemon.py
+++ b/daemon.py
@@ -18239,7 +18239,7 @@ class PubServer(BaseHTTPRequestHandler):
             edit_post_params = {}
             if authorized and \
                '/users/' in self.path and \
-               '/editpost?scope=' in self.path and \
+               '/postedit?scope=' in self.path and \
                ';postid=' in self.path and \
                ';actor=' in self.path:
                 post_scope = self.path.split('?scope=')[1]
diff --git a/webapp_post.py b/webapp_post.py
index be30a24ab..5153749d4 100644
--- a/webapp_post.py
+++ b/webapp_post.py
@@ -542,8 +542,7 @@ def _get_edit_icon_html(base_dir: str, nickname: str, domain_full: str,
                 edit_str += \
                     '        ' + \
                     '<a class="imageAnchor" href="/users/' + \
-                    nickname + \
-                    '/tlblogs?editblogpost=' + \
+                    nickname + '/tlblogs?editblogpost=' + \
                     post_id.split('/statuses/')[1] + \
                     ';actor=' + actor_nickname + \
                     '" title="' + edit_blog_post_str + '" tabindex="10">' + \
@@ -583,8 +582,7 @@ def _get_edit_icon_html(base_dir: str, nickname: str, domain_full: str,
             edit_str += \
                 '        ' + \
                 '<a class="imageAnchor" href="/users/' + \
-                nickname + \
-                '/editpost?scope=public;postid=' + \
+                nickname + '/postedit?scope=public;postid=' + \
                 post_id.split('/statuses/')[1] + \
                 ';actor=' + actor_nickname + \
                 '" title="' + edit_post_str + '" tabindex="10">' + \
@@ -599,8 +597,7 @@ def _get_edit_icon_html(base_dir: str, nickname: str, domain_full: str,
             edit_str += \
                 '        ' + \
                 '<a class="imageAnchor" href="/users/' + \
-                nickname + \
-                '/editpost?scope=dm;postid=' + \
+                nickname + '/postedit?scope=dm;postid=' + \
                 post_id.split('/statuses/')[1] + \
                 ';actor=' + actor_nickname + \
                 '" title="' + edit_post_str + '" tabindex="10">' + \
@@ -615,8 +612,7 @@ def _get_edit_icon_html(base_dir: str, nickname: str, domain_full: str,
             edit_str += \
                 '        ' + \
                 '<a class="imageAnchor" href="/users/' + \
-                nickname + \
-                '/editpost?scope=unlisted;postid=' + \
+                nickname + '/postedit?scope=unlisted;postid=' + \
                 post_id.split('/statuses/')[1] + \
                 ';actor=' + actor_nickname + \
                 '" title="' + edit_post_str + '" tabindex="10">' + \
@@ -631,8 +627,7 @@ def _get_edit_icon_html(base_dir: str, nickname: str, domain_full: str,
             edit_str += \
                 '        ' + \
                 '<a class="imageAnchor" href="/users/' + \
-                nickname + \
-                '/editpost?scope=followers;postid=' + \
+                nickname + '/postedit?scope=followers;postid=' + \
                 post_id.split('/statuses/')[1] + \
                 ';actor=' + actor_nickname + \
                 '" title="' + edit_post_str + '" tabindex="10">' + \