diff --git a/data/org.gnome.Cheese.gschema.xml b/data/org.gnome.Cheese.gschema.xml
index 7275b5e5cfd8d4f7517351fae770db3ce5305e69..457cde450c68cf8e77433e0bcfd17284997d3077 100644
--- a/data/org.gnome.Cheese.gschema.xml
+++ b/data/org.gnome.Cheese.gschema.xml
@@ -22,7 +22,7 @@
 
     <key type='s' name='camera'>
       <summary>Camera device string indicator</summary>
-      <description>The path to the device node which points to the camera, for example /dev/video0</description>
+      <description>The display name of the camera, for example 'HD Pro Webcam C920'</description>
       <default>''</default>
     </key>
 
diff --git a/src/cheese-window.vala b/src/cheese-window.vala
index cc119b687ec67f8db1c60be6f9e8981fcbd9a111..d964f3bf8ab45e422e81108f722e0220f2012f93 100644
--- a/src/cheese-window.vala
+++ b/src/cheese-window.vala
@@ -1232,7 +1232,7 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
       {
           return;
       }
-
+      
       cameras = camera.get_camera_devices ();
 
       for (i = 0; i < cameras.length; i++)
@@ -1262,6 +1262,7 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
 
       camera.set_device (next);
       camera.switch_camera_device ();
+      settings.set_string ("camera", next.get_name ());
   }
 
   /**