diff --git a/bundles/core/src/main/java/io/wcm/samples/core/config/impl/LinkHandlerConfigImpl.java b/bundles/core/src/main/java/io/wcm/samples/core/config/impl/LinkHandlerConfigImpl.java
index 2df84a7d..662b21cb 100644
--- a/bundles/core/src/main/java/io/wcm/samples/core/config/impl/LinkHandlerConfigImpl.java
+++ b/bundles/core/src/main/java/io/wcm/samples/core/config/impl/LinkHandlerConfigImpl.java
@@ -31,6 +31,7 @@
 import io.wcm.handler.link.spi.LinkHandlerConfig;
 import io.wcm.handler.link.spi.LinkType;
 import io.wcm.handler.link.type.ExternalLinkType;
+import io.wcm.handler.link.type.InternalCrossContextLinkType;
 import io.wcm.handler.link.type.InternalLinkType;
 import io.wcm.handler.link.type.MediaLinkType;
 import io.wcm.samples.core.config.AppTemplate;
@@ -45,6 +46,7 @@ public class LinkHandlerConfigImpl extends LinkHandlerConfig {
 
   private static final List<Class<? extends LinkType>> LINK_TYPES = List.of(
       InternalLinkType.class,
+      InternalCrossContextLinkType.class,
       ExternalLinkType.class,
       MediaLinkType.class,
       WikipediaLinkType.class);
diff --git a/bundles/core/src/main/webapp/app-root/components/global/include/linkRefNoTitleTab.json b/bundles/core/src/main/webapp/app-root/components/global/include/linkRefNoTitleTab.json
index 0fdd9bfd..290c55b1 100644
--- a/bundles/core/src/main/webapp/app-root/components/global/include/linkRefNoTitleTab.json
+++ b/bundles/core/src/main/webapp/app-root/components/global/include/linkRefNoTitleTab.json
@@ -10,7 +10,18 @@
       "items": {
         "linkRef": {
           "sling:resourceType": "wcm-io/handler/link/components/granite/form/linkRefContainer",
-          "showLinkTitle": false
+          "showLinkTitle": false,
+          "allLinkTypeFields": {
+            "linkFragment": {
+              "sling:resourceType": "granite/ui/components/coral/foundation/form/textfield",
+              "name": "./linkFragment",
+              "fieldLabel": "Fragment",
+              "granite:class": "linkRefContainer-option-linktype-showhide-target",
+              "granite:data": {
+                "showhidetargetvalues": "internal,internalCrossContext"
+              }
+            }
+          }
         }
       }
     }
diff --git a/bundles/core/src/main/webapp/app-root/components/global/include/linkRefTab.json b/bundles/core/src/main/webapp/app-root/components/global/include/linkRefTab.json
index 2d433088..139e68c9 100644
--- a/bundles/core/src/main/webapp/app-root/components/global/include/linkRefTab.json
+++ b/bundles/core/src/main/webapp/app-root/components/global/include/linkRefTab.json
@@ -10,7 +10,18 @@
       "items": {
         "linkRef": {
           "sling:resourceType": "wcm-io/handler/link/components/granite/form/linkRefContainer",
-          "showLinkTitle": true
+          "showLinkTitle": true,
+          "allLinkTypeFields": {
+            "linkFragment": {
+              "sling:resourceType": "granite/ui/components/coral/foundation/form/textfield",
+              "name": "./linkFragment",
+              "fieldLabel": "Fragment",
+              "granite:class": "linkRefContainer-option-linktype-showhide-target",
+              "granite:data": {
+                "showhidetargetvalues": "internal,internalCrossContext"
+              }
+            }
+          }
         }
       }
     }
diff --git a/parent/pom.xml b/parent/pom.xml
index 6d4f9333..25eba463 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -172,7 +172,7 @@
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.wcm.ui.granite</artifactId>
-        <version>1.9.14</version>
+        <version>1.9.15-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>io.wcm</groupId>