diff --git a/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/document/sidebar/DocumentMetadataAnnotationSelectionPanel.html b/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/document/sidebar/DocumentMetadataAnnotationSelectionPanel.html
index 2358a16a6d..6028ab1c73 100644
--- a/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/document/sidebar/DocumentMetadataAnnotationSelectionPanel.html
+++ b/inception/inception-layer-docmetadata/src/main/java/de/tudarmstadt/ukp/inception/annotation/layer/document/sidebar/DocumentMetadataAnnotationSelectionPanel.html
@@ -47,7 +47,7 @@
       </div>
     </div>
     <div class="flex-grow-1 flex-v-container">
-      <ul wicket:id="layersContainer" class="scrolling flex-content list-group list-group-flush">
+      <ul wicket:id="layersContainer" class="scrolling preserve-scroll flex-content list-group list-group-flush">
         <li wicket:id="layers" class="list-group-item py-0 px-0 border-0">
           <div class="px-2 py-1 bg-light-subtle fw-bold sticky-top border-top border-bottom">
             <wicket:container wicket:id="layerName"/>
diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/KbLabelCachePrewarmStep.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/KbLabelCachePrewarmStep.java
index a3be243eee..933cb0a5a0 100644
--- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/KbLabelCachePrewarmStep.java
+++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/KbLabelCachePrewarmStep.java
@@ -24,8 +24,9 @@
 import java.util.List;
 import java.util.Set;
 
-import org.apache.uima.cas.text.AnnotationFS;
+import org.apache.uima.cas.FeatureStructure;
 import org.apache.uima.fit.util.FSUtil;
+import org.apache.uima.jcas.cas.AnnotationBase;
 import org.apache.uima.jcas.tcas.Annotation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -140,8 +141,10 @@ private void collectKeysForLayer(org.apache.uima.cas.CAS aCas, AnnotationLayer a
             return;
         }
 
-        for (var fs : aCas.<Annotation> select(type)) {
-            if (!overlapping(fs, aWindowBegin, aWindowEnd)) {
+        // Document-level layers are AnnotationBase subtypes without offsets - they are always
+        // in the window, so the overlap check applies only to proper Annotations.
+        for (var fs : aCas.<AnnotationBase> select(type)) {
+            if (fs instanceof Annotation ann && !overlapping(ann, aWindowBegin, aWindowEnd)) {
                 continue;
             }
             for (var info : featureInfos) {
@@ -163,7 +166,7 @@ private FeatureInfo toFeatureInfo(AnnotationFeature aFeature)
         return null;
     }
 
-    private void extractKeys(FeatureInfo aInfo, AnnotationFS aFs, Set<Key> aOut)
+    private void extractKeys(FeatureInfo aInfo, FeatureStructure aFs, Set<Key> aOut)
     {
         var feature = aInfo.feature();
         if (!aInfo.isMulti()) {