diff --git a/typo3/sysext/workspaces/Resources/Public/JavaScript/workspaces.js b/typo3/sysext/workspaces/Resources/Public/JavaScript/workspaces.js
index 4459d9559d8326c48beac70706925321ac1a7b15..4250ec7858b4bf53fbc1edc2e138e0f5c740ef60 100644
--- a/typo3/sysext/workspaces/Resources/Public/JavaScript/workspaces.js
+++ b/typo3/sysext/workspaces/Resources/Public/JavaScript/workspaces.js
@@ -16,6 +16,9 @@ Ext.ns('TYPO3.Workspaces');
 TYPO3.Workspaces.App = {
 
 	init : function() {
+		// With a large amount of unpublished changes, the workspace grid requires a longer Ajax timeout
+		Ext.Ajax.timeout = 120000;
+
 		TYPO3.Workspaces.WorkspaceGrid.initColModel();
 		TYPO3.Workspaces.WorkspaceGrid.render('workspacegrid');
 
@@ -80,4 +83,4 @@ Ext.onReady(function() {
 	// fire grid
 	var WS = new TYPO3.Workspaces.App.init();
 
-});
\ No newline at end of file
+});