Index: t3lib/class.t3lib_befunc.php
===================================================================
--- t3lib/class.t3lib_befunc.php	(revision 8804)
+++ t3lib/class.t3lib_befunc.php	(working copy)
@@ -2623,12 +2623,12 @@
 	 */
 	public static function viewOnClick($id, $backPath = '', $rootLine = '', $anchor = '', $altUrl = '', $addGetVars = '', $switchFocus = TRUE) {
 
-		$viewScriptPreviewEnabled  = t3lib_extMgm::isLoaded('version') ?
+		$viewScriptPreviewDisabled = t3lib_extMgm::isLoaded('version') ?
 			'/' . TYPO3_mainDir . t3lib_extMgm::extRelPath('version') . 'ws/wsol_preview.php?id='
 			:
 			'/index.php?id='
 		;
-		$viewScriptPreviewDisabled = '/index.php?id=';
+		$viewScriptPreviewEnabled = '/index.php?id=';
 		if ($altUrl) {
 			$viewScriptPreviewEnabled = $viewScriptPreviewDisabled = $altUrl;
 		}
@@ -2674,7 +2674,7 @@
 		$urlPreviewEnabled  = $viewDomain . $viewScriptPreviewEnabled . $id . $addGetVars . $anchor;
 		$urlPreviewDisabled = $viewDomain . $viewScriptPreviewDisabled . $id . $addGetVars . $anchor;
 
-		return "var previewWin=window.open(top.TYPO3.configuration.inWorkspace !== 0 && top.TYPO3.configuration.workspaceFrontendPreviewEnabled ?'" .
+		return "var previewWin=window.open((top.TYPO3.configuration.inWorkspace === 0 || (top.TYPO3.configuration.inWorkspace !== 0 && top.TYPO3.configuration.workspaceFrontendPreviewEnabled)) ?'" .
 			$urlPreviewEnabled . "':'" . $urlPreviewDisabled .
 			"','newTYPO3frontendWindow');" . ( $switchFocus ? 'previewWin.focus();' : '');
 	}
Index: typo3/js/workspacemenu.js
===================================================================
--- typo3/js/workspacemenu.js	(revision 8804)
+++ typo3/js/workspacemenu.js	(working copy)
@@ -152,7 +152,10 @@
 		var switchRequest = new Ajax.Request('ajax.php', {
 			parameters: 'ajaxID=WorkspaceMenu::setWorkspace&workspaceId=' + workspaceId,
 			onSuccess: function(transport, response) {
-				TYPO3.configuration.inWorkspace = response.setWorkspaceId === 0 ? 0 : 1;
+                if (!response.setWorkspaceId) {
+					response.setWorkspaceId = 0;
+				}
+				top.TYPO3.configuration.inWorkspace = response.setWorkspaceId === 0 ? 0 : 1;
 
 					// first remove all checks, then set the check in front of the selected workspace
 				var stateActiveClass = 't3-icon t3-icon-status t3-icon-status-status t3-icon-status-checked';