diff --git a/otk/widget.cc b/otk/widget.cc
index fa729a6f..e95848a6 100644
--- a/otk/widget.cc
+++ b/otk/widget.cc
@@ -55,6 +55,8 @@ OtkWidget::~OtkWidget()
   if (_visible)
     hide();
 
+  _event_dispatcher->clearHandler(_window);
+
   std::for_each(_children.begin(), _children.end(), PointerAssassin());
 
   if (_parent)