diff --git a/src/virt-viewer-window.c b/src/virt-viewer-window.c
index 0f65004..d89c15b 100644
--- a/src/virt-viewer-window.c
+++ b/src/virt-viewer-window.c
@@ -1092,10 +1092,11 @@ virt_viewer_window_save_screenshot(VirtViewerWindow *self,
     return result;
 }
 
-G_MODULE_EXPORT void
-virt_viewer_window_menu_file_screenshot(GtkWidget *menu G_GNUC_UNUSED,
-                                        VirtViewerWindow *self)
+void
+virt_viewer_window_screenshot(VirtViewerWindow *self)
 {
+    g_return_if_fail(VIRT_VIEWER_IS_WINDOW(self));
+
     GtkWidget *dialog;
     const char *image_dir;
 
@@ -1144,6 +1145,13 @@ retry_dialog:
     gtk_widget_destroy(dialog);
 }
 
+G_MODULE_EXPORT void
+virt_viewer_window_menu_file_screenshot(GtkWidget *menu G_GNUC_UNUSED,
+                                        VirtViewerWindow *self)
+{
+    virt_viewer_window_screenshot(self);
+}
+
 G_MODULE_EXPORT void
 virt_viewer_window_menu_file_usb_device_selection(GtkWidget *menu G_GNUC_UNUSED,
                                                   VirtViewerWindow *self)
@@ -1295,9 +1303,8 @@ iso_dialog_response(GtkDialog *dialog,
 }
 #endif
 
-G_MODULE_EXPORT void
-virt_viewer_window_menu_change_cd_activate(GtkWidget *menu G_GNUC_UNUSED,
-                                           VirtViewerWindow *self G_GNUC_UNUSED)
+void
+virt_viewer_window_change_cd(VirtViewerWindow *self G_GNUC_UNUSED)
 {
 #if HAVE_OVIRT
     GtkWidget *dialog;
@@ -1320,6 +1327,13 @@ virt_viewer_window_menu_change_cd_activate(GtkWidget *menu G_GNUC_UNUSED,
 #endif
 }
 
+G_MODULE_EXPORT void
+virt_viewer_window_menu_change_cd_activate(GtkWidget *menu G_GNUC_UNUSED,
+                                           VirtViewerWindow *self)
+{
+    virt_viewer_window_change_cd(self);
+}
+
 static void
 virt_viewer_window_toolbar_setup(VirtViewerWindow *self)
 {
diff --git a/src/virt-viewer-window.h b/src/virt-viewer-window.h
index 7350edb..cdb51db 100644
--- a/src/virt-viewer-window.h
+++ b/src/virt-viewer-window.h
@@ -65,3 +65,5 @@ GtkBuilder* virt_viewer_window_get_builder(VirtViewerWindow *window);
 void virt_viewer_window_set_kiosk(VirtViewerWindow *self, gboolean enabled);
 void virt_viewer_window_show_about(VirtViewerWindow *self);
 void virt_viewer_window_show_guest_details(VirtViewerWindow *self);
+void virt_viewer_window_screenshot(VirtViewerWindow *self);
+void virt_viewer_window_change_cd(VirtViewerWindow *self);