diff --git a/TODO.md b/TODO.md
index e62504c..208be3e 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,4 +1,4 @@
 * Parse refresh rate for modes and use it [DONE]
 * Test using older xrandr
-* Fix snapping (only works for one of the monitors?)
+* Fix snapping (only works for one of the monitors?) [DONE]
 * Normalize positions so they always start from 0:0
diff --git a/xrandroll/main.py b/xrandroll/main.py
index db4558e..04e1ac0 100644
--- a/xrandroll/main.py
+++ b/xrandroll/main.py
@@ -255,7 +255,6 @@ class Window(QObject):
                 snaps_x.append(monitor.pos_x + mod_x)
                 snaps_y.append(monitor.pos_y)
                 snaps_y.append(monitor.pos_y + mod_y)
-        print(snaps_x, snaps_y)
         return snaps_x, snaps_y
 
     def adjust_view(self):
diff --git a/xrandroll/monitor_item.py b/xrandroll/monitor_item.py
index 865d400..b0a4ccd 100644
--- a/xrandroll/monitor_item.py
+++ b/xrandroll/monitor_item.py
@@ -77,8 +77,8 @@ class MonitorItem(QGraphicsRectItem, QObject):
         new_pos = view.mapFromScene(self.orig_pos) + current_pos - click_pos
         new_pos = view.mapToScene(new_pos)
         delta = abs(view.mapToScene(0, 25).y())
-        if not event.modifiers() & Qt.ControlModifier:
-            # Check for snaps
+        if not event.modifiers() & Qt.ControlModifier:  # Ctrl was not pressed, so snap
+            # This snaps the left and top edges
             x = new_pos.x()
             delta_x = min((abs(x - sx), i) for i, sx in enumerate(snaps_x))
             if delta_x[0] < delta:  # snap
@@ -87,5 +87,16 @@ class MonitorItem(QGraphicsRectItem, QObject):
             delta_y = min((abs(y - sy), i) for i, sy in enumerate(snaps_y))
             if delta_y[0] < delta:  # snap
                 new_pos.setY(int(snaps_y[delta_y[1]]))
+
+            # This snaps the right and bottom edges
+            x = new_pos.x() + self.rect().width()
+            delta_x = min((abs(x - sx), i) for i, sx in enumerate(snaps_x))
+            if delta_x[0] < delta:  # snap
+                new_pos.setX(int(snaps_x[delta_x[1]]) - self.rect().width())
+            y = new_pos.y() + self.rect().height()
+            delta_y = min((abs(y - sy), i) for i, sy in enumerate(snaps_y))
+            if delta_y[0] < delta:  # snap
+                new_pos.setY(int(snaps_y[delta_y[1]]) - self.rect().height())
+
         self.setPos(new_pos)
         self.window.show_pos(int(self.pos().x()), int(self.pos().y()))