diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index e361a17ff578..40c78f7a4e81 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -109,7 +109,6 @@ void __EXPORT BasicIDEShell::ExecuteCurrent( SfxRequest& rReq )
                 {
                     if ( aDocument.removeModule( aLibName, aName ) )
                     {
-                        RemoveWindow( pCurWin, TRUE );
                         BasicIDE::MarkDocumentModified( aDocument );
                     }
                 }
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index e22103e3503c..e170c4c7d0fa 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -107,7 +107,7 @@ public:
         try
         {
             uno::Reference< container::XContainer > xContainer( rScriptDocument.getLibrary( E_SCRIPTS, aLibName, FALSE ), uno::UNO_QUERY );
-            if ( rScriptDocument.isDocument() && xContainer.is() )
+            if ( xContainer.is() )
             {
                 uno::Reference< container::XContainerListener > xContainerListener( this );
                 xContainer->addContainerListener( xContainerListener );
@@ -120,7 +120,7 @@ public:
         try
         {
             uno::Reference< container::XContainer > xContainer( rScriptDocument.getLibrary( E_SCRIPTS, aLibName, FALSE ), uno::UNO_QUERY );
-            if ( rScriptDocument.isDocument() && xContainer.is() )
+            if ( xContainer.is() )
             {
                 uno::Reference< container::XContainerListener > xContainerListener( this );
                 xContainer->removeContainerListener( xContainerListener );