diff --git a/geombuilder/inc/TGeoTabManager.h b/geombuilder/inc/TGeoTabManager.h
index fdd058302d05f559a9f53accb3a6fad97ed13cc0..cb058db93188a95ec857c44f68d0962f93ba9d13 100644
--- a/geombuilder/inc/TGeoTabManager.h
+++ b/geombuilder/inc/TGeoTabManager.h
@@ -1,4 +1,4 @@
-// @(#):$Name:  $:$Id: TGeoTabManager.h,v 1.1 2006/06/13 15:27:11 brun Exp $
+// @(#):$Name:  $:$Id: TGeoTabManager.h,v 1.2 2006/06/23 16:00:13 brun Exp $
 // Author: M.Gheata 
 
 /*************************************************************************
@@ -59,7 +59,7 @@ private:
    TGCompositeFrame    *fVolumeCont;        // Volume tab container
 
    void                CreateTabs();
-   void                GetEditors(TClass *cl, TGCompositeFrame *style);
+   void                GetEditors(TClass *cl);
 public:
    TGeoTabManager(TVirtualPad *pad, TGTab *tab);
    virtual ~TGeoTabManager();
diff --git a/geombuilder/src/TGeoManagerEditor.cxx b/geombuilder/src/TGeoManagerEditor.cxx
index 987cae55e5ac443b425a0df7e6e4c41a4cd5f17f..8f4c7467dfbe5082a82fe3ff7668cd6cffe34b48 100644
--- a/geombuilder/src/TGeoManagerEditor.cxx
+++ b/geombuilder/src/TGeoManagerEditor.cxx
@@ -1,4 +1,4 @@
-// @(#):$Name:  $:$Id: TGeoManagerEditor.cxx,v 1.2 2006/06/19 14:58:48 brun Exp $
+// @(#):$Name:  $:$Id: TGeoManagerEditor.cxx,v 1.3 2006/06/23 16:00:13 brun Exp $
 // Author: M.Gheata 
 
 /*************************************************************************
@@ -1113,8 +1113,8 @@ void TGeoManagerEditor::DoEditVolume()
       return;
    }   
    fTabMgr->SetVolTabEnabled();
-   fTabMgr->GetVolumeEditor(fSelectedVolume);
    fTabMgr->SetTab();
+   fTabMgr->GetVolumeEditor(fSelectedVolume);
    fSelectedVolume->Draw();
 }
 
diff --git a/geombuilder/src/TGeoTabManager.cxx b/geombuilder/src/TGeoTabManager.cxx
index 9853599758eeda3aacdd6e1a189f79c076ebcc96..9d733b9038252b150a140d110b7347e7877dae8a 100644
--- a/geombuilder/src/TGeoTabManager.cxx
+++ b/geombuilder/src/TGeoTabManager.cxx
@@ -1,4 +1,4 @@
-// @(#):$Name:  $:$Id: TGeoTabManager.cxx,v 1.3 2006/06/20 06:33:20 brun Exp $
+// @(#):$Name:  $:$Id: TGeoTabManager.cxx,v 1.4 2006/06/23 16:00:13 brun Exp $
 // Author: M.Gheata 
 
 /*************************************************************************
@@ -91,7 +91,7 @@ void TGeoTabManager::CreateTabs()
    fVolumeCont = fTab->AddTab("Volume");   
    fVolumeTab = new TGCompositeFrame(fVolumeCont, 110, 30, kVerticalFrame);
    fVolumeCont->AddFrame(fVolumeTab, new TGLayoutHints(kLHintsTop | kLHintsExpandX, 0, 0, 2, 2));
-   fTab->SetEnabled(kFALSE);
+   fTab->SetEnabled(GetTabIndex(),kFALSE);
 }
 
 //______________________________________________________________________________
@@ -111,8 +111,8 @@ void TGeoTabManager::GetVolumeEditor(TGeoVolume *volume)
 {
 // Get editor for a volume.
    if (!volume || !fVolumeTab) return;
-   GetEditors(TAttLine::Class(), fVolumeTab);
-   GetEditors(TGeoVolume::Class(), fVolumeTab);
+   GetEditors(TAttLine::Class());
+   GetEditors(TGeoVolume::Class());
    SetModel(volume, 0);
 }
    
@@ -153,11 +153,12 @@ void TGeoTabManager::GetMaterialEditor(TGeoMaterial *material)
 }
 
 //______________________________________________________________________________
-void TGeoTabManager::GetEditors(TClass *cl, TGCompositeFrame *style)
+void TGeoTabManager::GetEditors(TClass *cl)
 {
 // Get editor for a class.
    // Look in TClass::GetEditorList() for any object deriving from TGedFrame,
    static Int_t icount = 0;
+   TGCompositeFrame *style = fVolumeTab;   
    TGedElement *ge;
    TList *list = cl->GetEditorList();
    TIter next1(list);
diff --git a/geombuilder/src/TGeoVolumeEditor.cxx b/geombuilder/src/TGeoVolumeEditor.cxx
index a0a56221321f248e4be932ed32c13849125bde91..d7757df70e900cb17d29a38877924da955417f29 100644
--- a/geombuilder/src/TGeoVolumeEditor.cxx
+++ b/geombuilder/src/TGeoVolumeEditor.cxx
@@ -1,4 +1,4 @@
-// @(#):$Name:  $:$Id: TGeoVolumeEditor.cxx,v 1.2 2006/06/19 14:58:48 brun Exp $
+// @(#):$Name:  $:$Id: TGeoVolumeEditor.cxx,v 1.3 2006/06/23 16:00:13 brun Exp $
 // Author: M.Gheata 
 
 /*************************************************************************
@@ -72,7 +72,7 @@ TGeoVolumeEditor::TGeoVolumeEditor(const TGWindow *p, Int_t id, Int_t width,
    : TGedFrame(p, id, width, height, options | kVerticalFrame, back)
 {
    // Constructor for volume editor.
-   fGeometry = 0;
+    fGeometry = 0;
    fVolume   = 0;
    
    fIsModified = kFALSE;
@@ -513,6 +513,7 @@ void TGeoVolumeEditor::SetModel(TVirtualPad* pad, TObject* obj, Int_t /*event*/)
    
    if (fInit) ConnectSignals2Slots();
    SetActive();
+   if (GetParent()==fTabMgr->GetVolumeTab()) fTab->Layout();
 }
 
 //______________________________________________________________________________