=== modified file 'plugins/unityshell/src/LauncherController.cpp'
--- plugins/unityshell/src/LauncherController.cpp	2011-08-03 03:01:46 +0000
+++ plugins/unityshell/src/LauncherController.cpp	2011-08-05 12:59:12 +0000
@@ -207,11 +207,11 @@
 void
 LauncherController::UpdateNumWorkspaces(int workspaces)
 {
-  if ((_num_workspaces == 0) && (workspaces > 0))
+  if ((_num_workspaces == 1) && (workspaces > 1))
   {
     InsertExpoAction();
   }
-  else if ((_num_workspaces > 0) && (workspaces == 0))
+  else if ((_num_workspaces > 1) && (workspaces == 1))
   {
     RemoveExpoAction();
   }

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2011-08-03 01:10:16 +0000
+++ plugins/unityshell/src/unityshell.cpp	2011-08-05 12:52:47 +0000
@@ -1134,7 +1134,8 @@
   bool status = screen->setOptionForPlugin(plugin, name, v);
   if (status)
   {
-    if (strcmp(plugin, "core") == 0 && strcmp(name, "hsize") == 0)
+    if (strcmp(plugin, "core") == 0 
+      && (strcmp(name, "hsize") == 0 || strcmp(name, "vsize") == 0))
     {
       controller->UpdateNumWorkspaces(screen->vpSize().width() * screen->vpSize().height());
     }