diff --git a/guibuilder/src/TGuiBldDragManager.cxx b/guibuilder/src/TGuiBldDragManager.cxx
index 6fa0c5f64180c04db46c063772fcbb161e58b811..0c31f2fade9028003e02fafe382ebc0e8f1a85b0 100644
--- a/guibuilder/src/TGuiBldDragManager.cxx
+++ b/guibuilder/src/TGuiBldDragManager.cxx
@@ -1,4 +1,4 @@
-// @(#)root/guibuilder:$Name:  $:$Id: TGuiBldDragManager.cxx,v 1.49 2006/06/01 11:38:57 antcheva Exp $
+// @(#)root/guibuilder:$Name:  $:$Id: TGuiBldDragManager.cxx,v 1.50 2006/07/04 09:21:56 antcheva Exp $
 // Author: Valeriy Onuchin   12/09/04
 
 /*************************************************************************
@@ -6237,10 +6237,10 @@ void TGuiBldDragManager::SetLassoDrawn(Bool_t on)
    fLassoDrawn = on;
 
    if (fBuilder) {
-      fBuilder->EnableLassoButtons(on);
-
       if (on) {
          fBuilder->EnableEditButtons(kFALSE);
       }
+
+      fBuilder->EnableLassoButtons(on);
    }
 }
diff --git a/guibuilder/src/TRootGuiBuilder.cxx b/guibuilder/src/TRootGuiBuilder.cxx
index 491ed1435a34c4a3dc65465e114e0fe8c9a44eb5..31bc8380478c887d3d3054956b65fdd8f1bd1c26 100644
--- a/guibuilder/src/TRootGuiBuilder.cxx
+++ b/guibuilder/src/TRootGuiBuilder.cxx
@@ -1,4 +1,4 @@
-// @(#)root/guibuilder:$Name:  $:$Id: TRootGuiBuilder.cxx,v 1.36 2006/06/14 07:52:55 antcheva Exp $
+// @(#)root/guibuilder:$Name:  $:$Id: TRootGuiBuilder.cxx,v 1.37 2006/06/14 10:22:37 antcheva Exp $
 // Author: Valeriy Onuchin   12/09/04
 
 /*************************************************************************
@@ -1165,6 +1165,12 @@ void TRootGuiBuilder::EnableLassoButtons(Bool_t on)
    if (btn) {
       btn->SetState(kButtonUp);
    }
+
+   btn = fToolBar->GetButton(kCropAct);
+   if (btn) {
+      btn->SetState(!on ? kButtonDisabled : kButtonUp);
+   }
+
 }
 
 //______________________________________________________________________________
@@ -1273,7 +1279,7 @@ void TRootGuiBuilder::EnableEditButtons(Bool_t on)
 
    btn = fToolBar->GetButton(kCropAct);
    if (btn) {
-      btn->SetState(!on ? kButtonDisabled : kButtonUp);
+      btn->SetState(!on && !lasso ? kButtonDisabled : kButtonUp);
    }
 
    btn = fToolBar->GetButton(kDeleteAct);