diff --git a/src/core/meta-workspace-manager.c b/src/core/meta-workspace-manager.c
index 777ae18b9..4a20812ab 100644
--- a/src/core/meta-workspace-manager.c
+++ b/src/core/meta-workspace-manager.c
@@ -1073,6 +1073,7 @@ meta_workspace_manager_workspace_switched (MetaWorkspaceManager *workspace_manag
     g_signal_emit (workspace_manager,
                    workspace_manager_signals[CONTEXT_SWITCHED],
                    0, NULL);
+    g_object_notify (G_OBJECT (workspace_manager), "n-workspaces");
   } else {
     g_signal_emit (workspace_manager,
                    workspace_manager_signals[WORKSPACE_SWITCHED], 0,
diff --git a/src/meta/meta-workspace-manager.h b/src/meta/meta-workspace-manager.h
index df5116b3c..5a3839960 100644
--- a/src/meta/meta-workspace-manager.h
+++ b/src/meta/meta-workspace-manager.h
@@ -86,12 +86,6 @@ void meta_workspace_manager_override_workspace_layout (MetaWorkspaceManager *wor
                                                        int                   n_rows,
                                                        int                   n_columns);
 
-META_EXPORT
-MetaWorkspaceContext *
-meta_workspace_manager_active_context (MetaWorkspaceManager *workspace_manager);
-
-META_EXPORT
-guint meta_workspace_manager_active_context_id (MetaWorkspaceManager *workspace_manager);
 
 META_EXPORT
 int meta_workspace_manager_get_layout_columns (MetaWorkspaceManager *workspace_manager);
@@ -99,6 +93,10 @@ int meta_workspace_manager_get_layout_columns (MetaWorkspaceManager *workspace_m
 META_EXPORT
 int meta_workspace_manager_get_layout_rows (MetaWorkspaceManager *workspace_manager);
 
+META_EXPORT
+MetaWorkspaceContext *
+meta_workspace_manager_active_context (MetaWorkspaceManager *workspace_manager);
+
 META_EXPORT
 guint meta_workspace_manager_active_context_id (MetaWorkspaceManager *workspace_manager);