diff -r 96b0a867c0fa -r 32b71ba642aa mainwindow.cpp
--- a/mainwindow.cpp	Fri Jun 29 09:43:54 2007 +0000
+++ b/mainwindow.cpp	Fri Jun 29 15:12:04 2007 +0000
@@ -2892,6 +2892,7 @@
 		BranchObj *bo=(BranchObj*)me->getSelection();
 		BranchObj *newbo=me->addNewBranch(0);
 
+		prevSelection=bo->getSelectString();
 		if (newbo) 
 			me->select (newbo->getSelectString());
 		else
@@ -2899,10 +2900,19 @@
 
 		if (actionSettingsAutoEdit->isOn())
 		{
-			if (!actionSettingsAutoSelectHeading->isOn())
-				prevSelection=bo->getSelectString();
 			editHeading();
+			return;
+		}	
+			/*
+		if (!actionSettingsAutoSelectHeading->isOn())
+			me->select(bo->getSelectString());
+			*/	
+		if (!prevSelection.isEmpty()) 
+		{
+			me->select(prevSelection);
+			prevSelection="";
 		}
+
 	}	
 }