diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index 06bdc2d924a2..0aabe8473dbb 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: macrodlg.cxx,v $
  *
- *  $Revision: 1.19 $
+ *  $Revision: 1.20 $
  *
- *  last change: $Author: ab $ $Date: 2002-07-30 13:10:21 $
+ *  last change: $Author: ab $ $Date: 2002-08-06 09:12:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -130,6 +130,8 @@ MacroChooser::MacroChooser( Window* pParnt, BOOL bScanBasics ) :
     // die BasicIDE.
     bForceStoreBasic = FALSE;
 
+    aMacrosInTxtBaseStr = aMacrosInTxt.GetText();
+
     aMacroBox.SetSelectionMode( SINGLE_SELECTION );
     aMacroBox.SetHighlightRange(); // ueber ganze Breite selektieren
 
@@ -576,6 +578,8 @@ IMPL_LINK( MacroChooser, MacroSelectHdl, SvTreeListBox *, pBox )
 
 IMPL_LINK( MacroChooser, BasicSelectHdl, SvTreeListBox *, pBox )
 {
+    static String aSpaceStr = String::CreateFromAscii(" ");
+
     // Wird auch gerufen, wenn Deselektiert!
     // 2 Funktionsaufrufe in jedem SelectHdl, nur weil Olli
     // keinen separatren DeselctHdl einfuehren wollte:
@@ -588,6 +592,12 @@ IMPL_LINK( MacroChooser, BasicSelectHdl, SvTreeListBox *, pBox )
     aMacroBox.Clear();
     if ( pModule )
     {
+        String aStr = aMacrosInTxtBaseStr;
+        aStr += aSpaceStr;
+        aStr += pModule->GetName();
+
+        aMacrosInTxt.SetText( aStr );
+
         // Die Macros sollen in der Reihenfolge angezeigt werden,
         // wie sie im Modul stehen.
         MacroList aMacros;
diff --git a/basctl/source/basicide/macrodlg.hxx b/basctl/source/basicide/macrodlg.hxx
index 0d92d24e8bbc..8d3b292f82f1 100644
--- a/basctl/source/basicide/macrodlg.hxx
+++ b/basctl/source/basicide/macrodlg.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: macrodlg.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: ab $ $Date: 2002-07-30 13:10:22 $
+ *  last change: $Author: ab $ $Date: 2002-08-06 09:12:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -100,6 +100,7 @@ private:
     FixedText               aMacroNameTxt;
     Edit                    aMacroNameEdit;
     FixedText               aMacrosInTxt;
+    String                  aMacrosInTxtBaseStr;
     SvTreeListBox           aMacroBox;
     FixedText               aMacroFromTxT;
     FixedText               aMacrosSaveInTxt;
diff --git a/basctl/source/basicide/macrodlg.src b/basctl/source/basicide/macrodlg.src
index 79d34ebb2cac..629d05a90019 100644
--- a/basctl/source/basicide/macrodlg.src
+++ b/basctl/source/basicide/macrodlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: macrodlg.src,v $
  *
- *  $Revision: 1.41 $
+ *  $Revision: 1.42 $
  *
- *  last change: $Author: kz $ $Date: 2002-08-05 20:31:43 $
+ *  last change: $Author: ab $ $Date: 2002-08-06 09:12:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -89,8 +89,8 @@ ModalDialog RID_MACROCHOOSER
     {
         Pos = MAP_APPFONT ( 122 , 30 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
-        Text = "Makros ~in " ;
-        Text [ ENGLISH ] = "Macros ~in " ;
+        Text = "Vorhandene Makros ~in:" ;
+        Text [ ENGLISH ] = "Existing macros ~in:" ;
         Text[ english_us ] = "Existing macros ~in:";
         Text[ portuguese ] = "Macros ~in ";
         Text[ russian ] = "Macros ~in ";
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index fc6ccdee976d..0e2997b61d67 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: moduldlg.cxx,v $
  *
- *  $Revision: 1.20 $
+ *  $Revision: 1.21 $
  *
- *  last change: $Author: ab $ $Date: 2002-07-30 13:10:27 $
+ *  last change: $Author: ab $ $Date: 2002-08-06 09:12:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1065,8 +1065,8 @@ SbModule* createModImpl( Window* pWin, SfxObjectShell* pShell, StarBASIC* pLib,
 
     if (xNewDlg->Execute() != 0)
     {
-        if ( aModName.Len() == 0 )
-            aModName = BasicIDE::CreateModuleName( pShell, aLibName );
+        if ( xNewDlg->GetObjectName().Len() )
+            aModName = xNewDlg->GetObjectName();
 
         try
         {