diff --git a/gpad/src/TPad.cxx b/gpad/src/TPad.cxx
index a69f40efdab25de6ad8d1cc2d23f8c17b393c7f4..8c91503cf147a8bd33677b423b9842daf083318c 100644
--- a/gpad/src/TPad.cxx
+++ b/gpad/src/TPad.cxx
@@ -1,4 +1,4 @@
-// @(#)root/gpad:$Name:  $:$Id: TPad.cxx,v 1.234 2006/08/22 18:27:02 rdm Exp $
+// @(#)root/gpad:$Name:  $:$Id: TPad.cxx,v 1.235 2006/08/24 18:51:57 brun Exp $
 // Author: Rene Brun   12/12/94
 
 /*************************************************************************
@@ -866,6 +866,8 @@ void TPad::Close(Option_t *)
          fCanvas->ClearPadSave();
       if (fCanvas->GetSelectedPad() == this)
          fCanvas->SetSelectedPad(0);
+      if (fCanvas->GetClickSelectedPad() == this)
+         fCanvas->SetClickSelectedPad(0);
    }
 
    fMother = 0;