diff --git a/Configuration/FlexForm/Flexform.xml b/Configuration/FlexForm/Flexform.xml
index 388eb3d..143b5c7 100644
--- a/Configuration/FlexForm/Flexform.xml
+++ b/Configuration/FlexForm/Flexform.xml
@@ -82,7 +82,11 @@
                                 <type>select</type>
                                 <renderType>selectMultipleSideBySide</renderType>
                                 <foreign_table>tx_jpfaq_domain_model_category</foreign_table>
-                                <foreign_table_where>ORDER BY category</foreign_table_where>
+                                <foreign_table_where>
+                                    AND (0 IN (###PAGE_TSCONFIG_IDLIST###) OR {#tx_jpfaq_domain_model_category}.{#pid} IN (###PAGE_TSCONFIG_IDLIST###))
+                                    AND {#tx_jpfaq_domain_model_category}.{#sys_language_uid} IN (-1, ###REC_FIELD_sys_language_uid###)
+                                    ORDER BY category
+                                </foreign_table_where>
                                 <multiple>0</multiple>
                                 <size>10</size>
                                 <maxitems>100</maxitems>
@@ -301,4 +305,4 @@
             </ROOT>
         </categoryComment>
     </sheets>
-</T3DataStructure>
\ No newline at end of file
+</T3DataStructure>