$OpenBSD$
--- scribus/scribus.cpp.orig	Mon Oct  2 01:08:04 2006
+++ scribus/scribus.cpp	Tue Oct  3 19:40:26 2006
@@ -3988,10 +3988,7 @@ bool ScribusMainWindow::DoFileClose()
 //	if (doc->EditClip)
 //		nodePalette->doc = 0;
 	if (doc->EditClip)
-	{
-		ToggleFrameEdit();
-		nodePalette->setDoc(0,0);
-	}
+		NoFrameEdit();
 
 	bookmarkPalette->BView->clear();
 	bookmarkPalette->BView->NrItems = 0;
@@ -4074,6 +4071,8 @@ bool ScribusMainWindow::DoFileClose()
 	fileWatcher->removeFile(fName);
 	HaveDoc--;
 	view = NULL;
+	if (nodePalette->currentDocument() == doc)
+		nodePalette->setDoc(0, 0);
 	delete doc;
 	doc = NULL;
 	ActWin = NULL;
