1 files changed, 7 insertions, 4 deletions
diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx
index 831233e78068..bef969db9266 100644
--- a/basctl/source/basicide/basides2.cxx
+++ b/basctl/source/basicide/basides2.cxx
@@ -260,12 +260,15 @@ ModulWindow* BasicIDEShell::CreateBasWin( const ScriptDocument& rDocument, const
         {
             pWin = FindBasWin( rDocument, aLibName, aModName, FALSE, TRUE );
             if( !pWin )
-            {    // new module window
-            pWin = new ModulWindow( pModulLayout, rDocument, aLibName, aModName, aModule );
-            nKey = InsertWindowInTable( pWin );
+            {
+                // new module window
+                pWin = new ModulWindow( pModulLayout, rDocument, aLibName, aModName, aModule );
+                nKey = InsertWindowInTable( pWin );
+            }
+            else // we've gotten called recursively ( via listener from createModule above ), get outta here
+                return pWin;
         }
     }
-    }
     else
     {
         pWin->SetStatus( pWin->GetStatus() & ~BASWIN_SUSPENDED );