diff --git a/client/src/components/PostDetailPanel.jsx b/client/src/components/PostDetailPanel.jsx
index 661d138..9e3717e 100644
--- a/client/src/components/PostDetailPanel.jsx
+++ b/client/src/components/PostDetailPanel.jsx
@@ -436,7 +436,7 @@ export default function PostDetailPanel({ post, onClose, onSave, onDelete, brand
             {!isCreateMode && (
               <>
                 {/* Submit for Review */}
-                {(form.status === 'draft' || form.status === 'rejected') && (
+                {!reviewUrl && (
                   <button
                     onClick={handleSubmitReview}
                     disabled={submittingReview}
diff --git a/server/server.js b/server/server.js
index fdc2a7d..4e6482c 100644
--- a/server/server.js
+++ b/server/server.js
@@ -1480,14 +1480,18 @@ app.post('/api/posts/:id/submit-review', requireAuth, requireOwnerOrRole('posts'
     const expiresAt = new Date();
     expiresAt.setDate(expiresAt.getDate() + DEFAULTS.tokenExpiryDays);
 
-    await nocodb.update('Posts', req.params.id, {
-      status: 'in_review',
+    const updateData = {
       approval_token: token,
       token_expires_at: expiresAt.toISOString(),
-      approved_by_name: null,
-      approved_at: null,
-      feedback: null,
-    });
+    };
+    // Only change status to in_review for draft/rejected posts
+    if (!existing.status || existing.status === 'draft' || existing.status === 'rejected') {
+      updateData.status = 'in_review';
+      updateData.approved_by_name = null;
+      updateData.approved_at = null;
+      updateData.feedback = null;
+    }
+    await nocodb.update('Posts', req.params.id, updateData);
 
     const reviewUrl = `${req.protocol}://${req.get('host')}/review-post/${token}`;
     res.json({ success: true, token, reviewUrl, expiresAt: expiresAt.toISOString() });