diff --git a/src/application-window.vala b/src/application-window.vala
index d20e8c4d4c915a0191edefe809f088feb3da83e3..1ef12fb35418451298cb1b9fdd06f4052ec94129 100644
--- a/src/application-window.vala
+++ b/src/application-window.vala
@@ -119,17 +119,8 @@ namespace Queso {
         /* The on camera combo changed event handler. */
         [GtkCallback]
         private void on_video_source_button_toggled() {
-            if (video_source_button.active) {
-                vs_settings_dialog = (
-                    new VideoSourceSettingsDialog(this, devices));
-                vs_settings_dialog.show_all();
-                vs_settings_dialog.delete_event.connect(
-                    dispose_video_settings_dialog);
-            } else {
-                if (vs_settings_dialog != null)
-                    vs_settings_dialog.dispose();
-                vs_settings_dialog = null;
-            }
+            //app.activate_action("video-source-settings", null);
+            toggle_video_source_settings();
         }
 
         private bool dispose_video_settings_dialog() {
@@ -149,6 +140,23 @@ namespace Queso {
             case RECORDING_TOGGLED:
                 recording_toggled();
                 break;
+            case VIDEO_SOURCE_SETTINGS:
+                video_source_button.active = !video_source_button.active;
+                break;
+            }
+        }
+
+        private void toggle_video_source_settings() {
+            if (video_source_button.active) {
+                vs_settings_dialog = (
+                    new VideoSourceSettingsDialog(this, devices));
+                vs_settings_dialog.show_all();
+                vs_settings_dialog.delete_event.connect(
+                    dispose_video_settings_dialog);
+            } else {
+                if (vs_settings_dialog != null)
+                    vs_settings_dialog.dispose();
+                vs_settings_dialog = null;
             }
         }