diff --git a/include/group.hpp b/include/group.hpp
index f5c6864b..5ce331a8 100644
--- a/include/group.hpp
+++ b/include/group.hpp
@@ -30,7 +30,6 @@ class Group : public AModule {
   bool handleMouseEnter(GdkEventCrossing *const &ev) override;
   bool handleMouseLeave(GdkEventCrossing *const &ev) override;
   bool handleToggle(GdkEventButton *const &ev) override;
-  void addHoverHandlerTo(Gtk::Widget &widget);
   void show_group();
   void hide_group();
 };
diff --git a/src/group.cpp b/src/group.cpp
index 9b7ac2d5..50841efd 100644
--- a/src/group.cpp
+++ b/src/group.cpp
@@ -81,16 +81,9 @@ Group::Group(const std::string& name, const std::string& id, const Json::Value&
     }
   }
 
-  addHoverHandlerTo(revealer);
   event_box_.add(box);
 }
 
-void Group::addHoverHandlerTo(Gtk::Widget& widget) {
-  widget.add_events(Gdk::EventMask::ENTER_NOTIFY_MASK | Gdk::EventMask::LEAVE_NOTIFY_MASK);
-  widget.signal_enter_notify_event().connect(sigc::mem_fun(*this, &Group::handleMouseEnter));
-  widget.signal_leave_notify_event().connect(sigc::mem_fun(*this, &Group::handleMouseLeave));
-}
-
 void Group::show_group() {
   box.set_state_flags(Gtk::StateFlags::STATE_FLAG_PRELIGHT);
   revealer.set_reveal_child(true);
@@ -109,7 +102,7 @@ bool Group::handleMouseEnter(GdkEventCrossing* const& e) {
 }
 
 bool Group::handleMouseLeave(GdkEventCrossing* const& e) {
-  if (!click_to_reveal) {
+  if (!click_to_reveal && e->detail != GDK_NOTIFY_INFERIOR) {
     hide_group();
   }
   return false;