diff --git a/Settings.ui b/Settings.ui
index 9ff326159..5b8d8a4cf 100644
--- a/Settings.ui
+++ b/Settings.ui
@@ -1132,7 +1132,7 @@
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">If icons overflow the dock, only  the &lt;i&gt;Show Applications&lt;/i&gt; icon is active.</property>
+                            <property name="label" translatable="yes">If icons overflow the dock, only the edge of the dock and the &lt;i&gt;Show Applications&lt;/i&gt; icon are active.</property>
                             <property name="use_markup">True</property>
                             <property name="wrap">True</property>
                             <style>
diff --git a/myDash.js b/myDash.js
index 6b917ceeb..14837e2c4 100644
--- a/myDash.js
+++ b/myDash.js
@@ -553,7 +553,42 @@ const myDash = new Lang.Class({
 
         // If scroll is not used because the icon is resized, let the scroll event propagate.
         if (!this._dtdSettings.get_boolean('icon-size-fixed'))
-          return Clutter.EVENT_PROPAGATE;
+            return Clutter.EVENT_PROPAGATE;
+
+        let monitorIndex = this._dtdSettings.get_int('preferred-monitor');
+        let workArea = Main.layoutManager.getWorkAreaForMonitor(monitorIndex);
+
+        // Event coordinates are relative to the stage but can be transformed
+        // as the actor will only receive events within his bounds.
+        let stage_x, stage_y, ok, event_x, event_y, actor_w, actor_h;
+        [stage_x, stage_y] = event.get_coords();
+        [ok, event_x, event_y] = actor.transform_stage_point(stage_x, stage_y);
+        [actor_w, actor_h] = actor.get_size();
+
+        // If there is no need to scroll, or if the scroll event is within a 1px
+        // margin from the relevant edge of the actor, let the event propagate.
+        switch( this._position ) {
+            case St.Side.LEFT:
+                if (workArea.height > this._container.height || actor.child.height < actor.height
+                    || event_x <= 1)
+                    return Clutter.EVENT_PROPAGATE;
+                break;
+            case St.Side.RIGHT:
+                if (workArea.height > this._container.height || actor.child.height < actor.height
+                    || event_x >= actor_w - 2)
+                    return Clutter.EVENT_PROPAGATE;
+                break;
+            case St.Side.TOP:
+                if (workArea.width > this._container.width || actor.child.width < actor.width
+                    || event_y <= 1)
+                    return Clutter.EVENT_PROPAGATE;
+                break;
+            case St.Side.BOTTOM:
+                if (workArea.width > this._container.width || actor.child.width < actor.width
+                    || event_y >= actor_h - 2)
+                    return Clutter.EVENT_PROPAGATE;
+                break;
+        }
 
         // reset timeout to avid conflicts with the mousehover event
         if (this._ensureAppIconVisibilityTimeoutId>0) {