diff --git a/panels/keyboard/cc-keyboard-manager.c b/panels/keyboard/cc-keyboard-manager.c
index 82f646058..55618fc88 100644
--- a/panels/keyboard/cc-keyboard-manager.c
+++ b/panels/keyboard/cc-keyboard-manager.c
@@ -524,7 +524,7 @@ reload_sections (CcKeyboardManager *self)
   GHashTable *loaded_files;
   GDir *dir;
   gchar *default_wm_keybindings[] = { "Mutter", "GNOME Shell", NULL };
-  gchar **wm_keybindings;
+  g_auto(GStrv) wm_keybindings = NULL;
   const gchar * const * data_dirs;
   guint i;
 
@@ -601,7 +601,6 @@ reload_sections (CcKeyboardManager *self)
     }
 
   g_hash_table_destroy (loaded_files);
-  g_strfreev (wm_keybindings);
 
   /* Load custom keybindings */
   append_sections_from_gsettings (self);
diff --git a/panels/keyboard/wm-common.c b/panels/keyboard/wm-common.c
index 458a7ee25..4dea780b9 100644
--- a/panels/keyboard/wm-common.c
+++ b/panels/keyboard/wm-common.c
@@ -71,7 +71,7 @@ wm_common_get_current_window_manager (void)
     return g_strdup (WM_COMMON_UNKNOWN);
 }
 
-char**
+GStrv
 wm_common_get_current_keybindings (void)
 {
   Atom keybindings_atom = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "_GNOME_WM_KEYBINDINGS", False);
diff --git a/panels/keyboard/wm-common.h b/panels/keyboard/wm-common.h
index c68b7ab84..7d1c1bd5b 100644
--- a/panels/keyboard/wm-common.h
+++ b/panels/keyboard/wm-common.h
@@ -7,7 +7,7 @@
 
 /* Returns a strv of keybinding names for the window manager;
  * using _GNOME_WM_KEYBINDINGS if available, _NET_WM_NAME otherwise. */
-char **wm_common_get_current_keybindings (void);
+GStrv wm_common_get_current_keybindings (void);
 
 gpointer   wm_common_register_window_manager_change   (GFunc    func,
 						       gpointer data);