diff --git a/src/kits/app/Handler.cpp b/src/kits/app/Handler.cpp
index 5896cce3c1..163a37909e 100644
--- a/src/kits/app/Handler.cpp
+++ b/src/kits/app/Handler.cpp
@@ -131,6 +131,11 @@ BHandler::BHandler(const char *name)
 
 BHandler::~BHandler()
 {
+	if (LockLooper()) {
+		Looper()->RemoveHandler(this);
+		UnlockLooper();
+	}
+
 	// remove all filters
 	if (fFilters) {
 		int32 count = fFilters->CountItems();