diff --git a/src/Application.vala b/src/Application.vala
index 207ed5fb..80171fa5 100644
--- a/src/Application.vala
+++ b/src/Application.vala
@@ -34,7 +34,7 @@ public class Dock.Application : Gtk.Application {
             unity_client.add_client (LauncherManager.get_default ());
         }
 
-        active_window.present_with_time (Gdk.CURRENT_TIME);
+        active_window.present ();
     }
 
     public override bool dbus_register (DBusConnection connection, string object_path) throws Error {
diff --git a/src/Launcher.vala b/src/Launcher.vala
index 84986dbe..2e7b92cd 100644
--- a/src/Launcher.vala
+++ b/src/Launcher.vala
@@ -440,8 +440,8 @@ public class Dock.Launcher : Gtk.Box {
             return;
         }
 
-        if (((x > get_allocated_width () / 2) && target_index + 1 == source_index) || // Cursor entered from the RIGHT and source IS our neighbouring launcher to the RIGHT
-            ((x < get_allocated_width () / 2) && target_index - 1 != source_index)    // Cursor entered from the LEFT and source is NOT our neighbouring launcher to the LEFT
+        if (((x > get_width () / 2) && target_index + 1 == source_index) || // Cursor entered from the RIGHT and source IS our neighbouring launcher to the RIGHT
+            ((x < get_width () / 2) && target_index - 1 != source_index)    // Cursor entered from the LEFT and source is NOT our neighbouring launcher to the LEFT
         ) {
             // Move it to the left of us
             target_index = target_index > 0 ? target_index-- : target_index;