Index: typo3/sysext/cms/tslib/class.tslib_fe.php
===================================================================
--- typo3/sysext/cms/tslib/class.tslib_fe.php	(revision 32527)
+++ typo3/sysext/cms/tslib/class.tslib_fe.php	(working copy)
@@ -1690,7 +1690,7 @@
 				} else {
 					$message = 'You logged out from Workspace preview mode. Click this link to <a href="%1$s">go back to the website</a>';
 				}
-				
+
 				$returnUrl = t3lib_div::sanitizeLocalUrl(t3lib_div::_GET('returnUrl'));
 				die(sprintf($message,
 					htmlspecialchars(preg_replace('/\&?ADMCMD_prev=[[:alnum:]]+/', '', $returnUrl))
@@ -2328,9 +2328,14 @@
 							case 'content_fallback':
 								$fallBackOrder = t3lib_div::intExplode(',', $sys_language_content);
 								foreach($fallBackOrder as $orderValue)	{
-									if (!strcmp($orderValue,'0') || count($this->sys_page->getPageOverlay($this->id, $orderValue)))	{
-										$this->sys_language_content = $orderValue;	// Setting content uid (but leaving the sys_language_uid)
-										break;
+									if ($orderValue != '0') {
+										$newPageRow = $this->sys_page->getPageOverlay($this->page, $orderValue);
+										if (count($newPageRow) > 0)	{
+											$this->sys_language_content = $orderValue;
+											$this->sys_language_uid = $orderValue;
+											$this->page = $newPageRow;
+											break;
+										}
 									}
 								}
 							break;