diff --git a/web/editor_handler.go b/web/editor_handler.go
index bb1002b..86e1be8 100644
--- a/web/editor_handler.go
+++ b/web/editor_handler.go
@@ -127,8 +127,10 @@ func (h *EditorHandler) HandlePostEdit(c *fiber.Ctx) error {
 	published := c.FormValue("action") == "Publish"
 	if !published {
 		entry.SetPublishedAt(nil)
+	} else if entry.PublishedAt() == nil || entry.PublishedAt().IsZero() {
+		now := time.Now()
+		entry.SetPublishedAt(&now)
 	}
-
 	// update entry
 	entry.SetMetaData(meta)
 	err = h.entrySvc.Update(entry)