diff --git a/src/applications/transactions/editfield/PhabricatorEditField.php b/src/applications/transactions/editfield/PhabricatorEditField.php
index 94c95a5052..07bf3589a8 100644
--- a/src/applications/transactions/editfield/PhabricatorEditField.php
+++ b/src/applications/transactions/editfield/PhabricatorEditField.php
@@ -302,6 +302,14 @@ abstract class PhabricatorEditField extends Phobject {
   }
 
   public function getPreviewPanel() {
+    if ($this->getIsHidden()) {
+      return null;
+    }
+
+    if ($this->getIsLocked()) {
+      return null;
+    }
+
     return $this->previewPanel;
   }