diff --git a/src/app.cpp b/src/app.cpp
index b281f94..d75cac5 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -347,7 +347,7 @@ std::string App::urlFor(const std::string& name, const std::string& arg) const
     {
         return URL(base_url).appendPath("save-post").str();
     }
-    if(name == "publish-from-new-draft")
+    if(name == "publish-from-draft")
     {
         return URL(base_url).appendPath("publish-from-new-draft").str();
     }
@@ -597,14 +597,31 @@ void App::handleSavePost(const httplib::Request& req, httplib::Response& res)
     res.set_redirect(urlFor("post", std::to_string(*p.id)));
 }
 
-void App::handlePublishFromNewDraft(const httplib::Request& req, httplib::Response& res)
+void App::handlePublishFromDraft(const httplib::Request& req, httplib::Response& res)
     const
 {
     auto session = prepareSession(req, res);
     if(!session.has_value()) return;
 
-    ASSIGN_OR_RESPOND_ERROR(Post draft, formToPost(req, session->user.name), res);
-    ASSIGN_OR_RESPOND_ERROR(int64_t id, data->saveDraft(std::move(draft)), res);
+    ASSIGN_OR_RESPOND_ERROR(Post draft, formToPost(req, session->user.name),
+                            res);
+    int64_t id;
+    if(draft.id.has_value())
+    {
+        id = *draft.id;
+        auto ok_maybe = data->editDraft(draft);
+        if(!ok_maybe)
+        {
+            res.status = 500;
+            res.set_content(errorMsg(ok_maybe.error()), "text/plain");
+            return;
+        }
+    }
+    else
+    {
+        ASSIGN_OR_RESPOND_ERROR(id, data->saveDraft(std::move(draft)),
+                                res);
+    }
     if(!data->publishPost(id))
     {
         res.status = 500;
@@ -924,10 +941,10 @@ void App::setup()
     {
         handleSaveDraft(req, res);
     });
-    server.Post(getPath("publish-from-new-draft"),
+    server.Post(getPath("publish-from-draft"),
                 [&](const httplib::Request& req, httplib::Response& res)
     {
-        handlePublishFromNewDraft(req, res);
+        handlePublishFromDraft(req, res);
     });
     server.Get(getPath("attachments"),
                 [&](const httplib::Request& req, httplib::Response& res)
diff --git a/src/app.hpp b/src/app.hpp
index 3ce5db2..75e9493 100644
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -50,8 +50,8 @@ class App
                                 httplib::Response& res);
     void handleSavePost(const httplib::Request& req, httplib::Response& res)
         const;
-    void handlePublishFromNewDraft(const httplib::Request& req,
-                                   httplib::Response& res) const;
+    void handlePublishFromDraft(const httplib::Request& req,
+                                httplib::Response& res) const;
     void handleAttachments(const httplib::Request& req, httplib::Response& res);
     void handleAttachment(const httplib::Request& req, httplib::Response& res);
     void handleAttachmentUpload(const httplib::Request& req,
diff --git a/templates/create_post.html b/templates/create_post.html
index adef281..30ce945 100644
--- a/templates/create_post.html
+++ b/templates/create_post.html
@@ -43,7 +43,7 @@ <h1>{{ blog_title }}</h1>
           <div><textarea id="TextContent" name="content" required></textarea></div>
           <div id="ButtonBar">
             <input type="submit" value="Save draft" formaction="{{ url_for("save-draft") }}" formmethod="post" formtarget="_self" />
-            <input type="submit" value="Publish" formaction="{{ url_for("publish-from-new-draft") }}" formmethod="post" formtarget="_self" />
+            <input type="submit" value="Publish" formaction="{{ url_for("publish-from-draft") }}" formmethod="post" formtarget="_self" />
           </div>
         </form>
       </main>
diff --git a/templates/edit_draft.html b/templates/edit_draft.html
index 22d93b3..3a09a2f 100644
--- a/templates/edit_draft.html
+++ b/templates/edit_draft.html
@@ -51,7 +51,7 @@ <h1>{{ blog_title }}</h1>
           </div>
           <div id="ButtonBar">
             <input type="submit" value="Save draft" formaction="{{ url_for("save-draft") }}" formmethod="post" formtarget="_self" />
-            <input type="submit" value="Publish" formaction="{{ url_for("publish-from-new-draft") }}" formmethod="post" formtarget="_self" />
+            <input type="submit" value="Publish" formaction="{{ url_for("publish-from-draft") }}" formmethod="post" formtarget="_self" />
           </div>
         </form>
       </main>