diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ebb5ac403..c691d21673 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ### DEV
 
+ * Correctly show the DCA picker in the site structure (see #906).
  * Correctly update the style sheets if a format definition is enabled/disabled (see #893).
  * Always show the "show from" and "show until" fields (see #908).
 
diff --git a/src/Resources/contao/drivers/DC_Folder.php b/src/Resources/contao/drivers/DC_Folder.php
index 446936c8b7..26369aeb57 100644
--- a/src/Resources/contao/drivers/DC_Folder.php
+++ b/src/Resources/contao/drivers/DC_Folder.php
@@ -204,12 +204,7 @@ public function __construct($strTable)
 		// Initialize the picker
 		if (isset($_GET['target']) && \Input::get('act') != 'select' && \Input::get('act') != 'paste')
 		{
-			list($table) = explode('.', \Input::get('target'), 2);
-
-			if ($this->strTable != $table)
-			{
-				$this->initPicker();
-			}
+			$this->initPicker();
 		}
 
 		// Get all filemounts (root folders)
diff --git a/src/Resources/contao/drivers/DC_Table.php b/src/Resources/contao/drivers/DC_Table.php
index a36cfa3410..1c269db653 100644
--- a/src/Resources/contao/drivers/DC_Table.php
+++ b/src/Resources/contao/drivers/DC_Table.php
@@ -219,12 +219,7 @@ public function __construct($strTable, $arrModule=array())
 		// Initialize the picker
 		if (isset($_GET['target']) && \Input::get('act') != 'select' && \Input::get('act') != 'paste')
 		{
-			list($table) = explode('.', \Input::get('target'), 2);
-
-			if ($this->strTable != $table)
-			{
-				$this->initPicker();
-			}
+			$this->initPicker();
 		}
 
 		// Get the IDs of all root records (tree view)