Index: Classes/BackendUserInterface/WorkspaceSelectorToolbarItem.php
===================================================================
--- Classes/BackendUserInterface/WorkspaceSelectorToolbarItem.php	(revision 3802)
+++ Classes/BackendUserInterface/WorkspaceSelectorToolbarItem.php	(working copy)
@@ -75,7 +75,7 @@
 		if (t3lib_extMgm::isLoaded('workspaces')) {
 			if ($this->checkAccess == NULL) {
 					$availableWorkspaces = tx_Workspaces_Service_Workspaces::getAvailableWorkspaces();
-					if (count($availableWorkspaces) > 1) {
+					if (count($availableWorkspaces) > 0) {
 						$this->checkAccess = TRUE;
 					} else {
 						$this->checkAccess = FALSE;
Index: Classes/Service/Workspaces.php
===================================================================
--- Classes/Service/Workspaces.php	(revision 3802)
+++ Classes/Service/Workspaces.php	(working copy)
@@ -390,7 +390,7 @@
 	 * @return array
 	 */
 	protected function filterPermittedElements($recs, $table) {
-		$checkField = ($table == 'pages') ? 'uid' : 'pid';
+		$checkField = ($table == 'pages') ? 'uid' : 'wspid';
 		$permittedElements = array();
 		if (is_array($recs)) {
 			foreach ($recs as $rec) {