diff --git a/typo3/sysext/backend/Classes/Form/Wizard/SuggestWizardDefaultReceiver.php b/typo3/sysext/backend/Classes/Form/Wizard/SuggestWizardDefaultReceiver.php
index 494efd409fb77fbef8ba0f25f1d9cfff1bd25e4a..cdbe09fe5378d487c6a8ddc9e0e0b700f6d523f1 100644
--- a/typo3/sysext/backend/Classes/Form/Wizard/SuggestWizardDefaultReceiver.php
+++ b/typo3/sysext/backend/Classes/Form/Wizard/SuggestWizardDefaultReceiver.php
@@ -102,9 +102,7 @@ class SuggestWizardDefaultReceiver
         $this->queryBuilder->getRestrictions()
             ->removeAll()
             ->add(GeneralUtility::makeInstance(DeletedRestriction::class))
-            // if table is versionized, only get the records from the Live Workspace
-            // the overlay itself of WS-records is done below
-            ->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, 0));
+            ->add(GeneralUtility::makeInstance(WorkspaceRestriction::class, $this->getBackendUser()->workspace));
         $this->table = $table;
         $this->config = $config;
         // get a list of all the pages that should be looked on