diff --git a/src/laybasic/laybasic/layCellView.cc b/src/laybasic/laybasic/layCellView.cc
index a2473fc7e..065b8a345 100644
--- a/src/laybasic/laybasic/layCellView.cc
+++ b/src/laybasic/laybasic/layCellView.cc
@@ -145,6 +145,10 @@ LayoutHandle::rename (const std::string &name, bool force) throw (tl::Exception)
       tl::info << "Renamed layout from " << m_name << " to " << n;
     }
 
+    if (find (m_name) == this) {
+      ms_dict.erase (m_name);
+    }
+
     m_name = n;
     ms_dict.insert (std::make_pair (n, this));
     return;