diff --git a/extension.js b/extension.js
index 29ab522..47e113b 100644
--- a/extension.js
+++ b/extension.js
@@ -361,12 +361,12 @@ class MonitorWidget extends PanelMenu.Button {
         if (this.onLeave === 'signal')
             this.dbus.emitSignal('onLeave', this.fullname);
         else
-            return this._manageEventAction(this.onEnter);
+            return this._manageEventAction(this.onLeave);
 
         return Clutter.EVENT_PROPAGATE;
     }
 
-    _onScroll(/*actor, event*/) {
+    _onScroll(actor, event) {
         if (this.onScroll === 'signal') {
             let direction = event.get_scroll_direction ();
             if (direction ==  Clutter.ScrollDirection.UP)
@@ -374,7 +374,7 @@ class MonitorWidget extends PanelMenu.Button {
             else if (direction ==  Clutter.ScrollDirection.DOWN)
                 this.dbus.emitSignal('onScrollDown', this.fullname);
         } else
-            return this._manageEventAction(this.onEnter);
+            return this._manageEventAction(this.onScroll);
 
         return Clutter.EVENT_PROPAGATE;
     }