--- a/plugins/common/gsd-device-mapper.c
+++ b/plugins/common/gsd-device-mapper.c
@@ -735,6 +735,20 @@ mapper_recalculate_candidates (GsdDevice
 		if (input->output)
 			continue;
 
+		/* See if the device has an output configured and it is
+		 * present, just use that one. */
+		GnomeRROutput *rr_output;
+		GsdOutputInfo *output;
+		rr_output = settings_get_display (input->settings, mapper);
+
+		if (rr_output) {
+			output = g_hash_table_lookup (mapper->output_devices,
+						      rr_output);
+			input_info_set_output (input, output, FALSE, FALSE);
+			input_info_remap (input);
+			continue;
+		}
+
 		input_info_guess_candidates (input, outputs);
 		mapping_helper_add (helper, input, outputs);
 	}
