diff --git a/include/group.hpp b/include/group.hpp
index 03b2632f..67cf4385 100644
--- a/include/group.hpp
+++ b/include/group.hpp
@@ -19,7 +19,7 @@ class Group : public AModule {
   virtual Gtk::Box& getBox();
   void addWidget(Gtk::Widget& widget);
 
-  bool hangleMouseHover(GdkEventCrossing* const& e);
+  bool handleMouseHover(GdkEventCrossing* const& e);
 
  protected:
   Gtk::Box box;
@@ -28,6 +28,8 @@ class Group : public AModule {
   bool is_first_widget = true;
   bool is_drawer = false;
   std::string add_class_to_drawer_children;
+
+  void addHoverHandlerTo(Gtk::Widget& widget);
 };
 
 }  // namespace waybar
diff --git a/src/group.cpp b/src/group.cpp
index 240216c7..11e28d85 100644
--- a/src/group.cpp
+++ b/src/group.cpp
@@ -75,13 +75,11 @@ Group::Group(const std::string& name, const std::string& id, const Json::Value&
     revealer.add(revealer_box);
     box.pack_start(revealer);
 
-    revealer.add_events(Gdk::EventMask::ENTER_NOTIFY_MASK | Gdk::EventMask::LEAVE_NOTIFY_MASK);
-    revealer.signal_enter_notify_event().connect(sigc::mem_fun(*this, &Group::hangleMouseHover));
-    revealer.signal_leave_notify_event().connect(sigc::mem_fun(*this, &Group::hangleMouseHover));
+    addHoverHandlerTo(revealer);
   }
 }
 
-bool Group::hangleMouseHover(GdkEventCrossing* const& e) {
+bool Group::handleMouseHover(GdkEventCrossing* const& e) {
   switch (e->type) {
     case GDK_ENTER_NOTIFY:
       revealer.set_reveal_child(true);
@@ -96,6 +94,12 @@ bool Group::hangleMouseHover(GdkEventCrossing* const& e) {
   return true;
 }
 
+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::handleMouseHover));
+  widget.signal_leave_notify_event().connect(sigc::mem_fun(*this, &Group::handleMouseHover));
+}
+
 auto Group::update() -> void {
   // noop
 }
@@ -108,9 +112,7 @@ void Group::addWidget(Gtk::Widget& widget) {
 
     if (is_first_widget) {
       // Necessary because of GTK's hitbox detection
-      widget.add_events(Gdk::EventMask::ENTER_NOTIFY_MASK | Gdk::EventMask::LEAVE_NOTIFY_MASK);
-      widget.signal_enter_notify_event().connect(sigc::mem_fun(*this, &Group::hangleMouseHover));
-      widget.signal_leave_notify_event().connect(sigc::mem_fun(*this, &Group::hangleMouseHover));
+      addHoverHandlerTo(widget);
     } else {
       widget.get_style_context()->add_class(add_class_to_drawer_children);
     }