--- pageitem.cpp~trunk	2011-01-05 10:47:01.631170854 +0100
+++ pageitem.cpp	2011-01-05 10:48:40.770170015 +0100
@@ -2222,11 +2222,13 @@
 		return; // nothing to do -> return
 	if (newName.isEmpty())
 		return;
-	AnName = generateUniqueCopyName(newName);
+  QString oldName = AnName;
+  AnName = generateUniqueCopyName(newName);
+  AutoName = false;
 	if (UndoManager::undoEnabled())
 	{
 		SimpleState *ss = new SimpleState(Um::Rename, QString(Um::FromTo).arg(AnName).arg(newName));
-		ss->set("OLD_NAME", AnName);
+		ss->set("OLD_NAME", oldName);
 		ss->set("NEW_NAME", newName);
 		undoManager->action(this, ss);
 	}
