diff --git a/commands/CmdCD.c b/commands/CmdCD.c
index bb779d87..2eec220e 100644
--- a/commands/CmdCD.c
+++ b/commands/CmdCD.c
@@ -1084,11 +1084,13 @@ CmdCellname(w, cmd)
 		    if (cellDef->cd_fd == -1)
 			dbReadOpen(cellDef, NULL, TRUE, NULL);
 
-		    if (cellDef->cd_fd == -1)
-			TxError("Warning:  Cell %s is not writeable\n", cellDef->cd_name);
-#endif
-
+		    if (cellDef->cd_fd != -1)
+			cellDef->cd_flags &= ~CDNOEDIT;
+		    else
+			TxError("Advisory lock held on cell %s\n", cellDef->cd_name);
+#else
 		    cellDef->cd_flags &= ~CDNOEDIT;
+#endif
 		    WindAreaChanged(w, &w->w_screenArea);
 		    CmdSetWindCaption(EditCellUse, EditRootDef);
 		}