diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
index 346aa8c..70c2ab3 100644
--- a/plugins/xrandr/gsd-xrandr-manager.c
+++ b/plugins/xrandr/gsd-xrandr-manager.c
@@ -1432,6 +1432,11 @@ auto_configure_outputs (GsdXrandrManager *manager, guint32 timestamp)
                         break;
         }
 
+        GnomeOutputInfo * laptop_output = get_laptop_output_info (config);
+        if (laptop_output != NULL && laptop_output->on) {
+                laptop_output->primary = TRUE;
+        }
+
         /* Apply the configuration! */
 
         if (applicable)
