diff --git a/blocksuite/affine/shared/src/services/comment-service/block-element-comment-manager.ts b/blocksuite/affine/shared/src/services/comment-service/block-element-comment-manager.ts
index 5a1623644..88e268f6c 100644
--- a/blocksuite/affine/shared/src/services/comment-service/block-element-comment-manager.ts
+++ b/blocksuite/affine/shared/src/services/comment-service/block-element-comment-manager.ts
@@ -123,8 +123,7 @@ export class BlockElementCommentManager extends LifeCycleWatcher {
     const gfx = this.std.get(GfxControllerIdentifier);
     const elementsFromSurfaceSelection = selections
       .filter(s => s instanceof SurfaceSelection)
-      .flatMap(({ blockId, elements }) => {
-        if (blockId !== gfx.surface?.id) return [];
+      .flatMap(({ elements }) => {
         return elements
           .map(id => gfx.getElementById<GfxModel>(id))
           .filter(m => m !== null);
diff --git a/packages/frontend/core/src/blocksuite/view-extensions/comment/comment-provider.ts b/packages/frontend/core/src/blocksuite/view-extensions/comment/comment-provider.ts
index 5d6a07f10..234c93f1c 100644
--- a/packages/frontend/core/src/blocksuite/view-extensions/comment/comment-provider.ts
+++ b/packages/frontend/core/src/blocksuite/view-extensions/comment/comment-provider.ts
@@ -50,10 +50,7 @@ function getPreviewFromSelections(
     } else if (selection instanceof ImageSelection) {
       // Return <"Image"> for ImageSelection
       previews.push('<Image>');
-    } else if (
-      selection instanceof SurfaceSelection &&
-      gfx.surface?.id === selection.blockId
-    ) {
+    } else if (selection instanceof SurfaceSelection) {
       selection.elements.forEach(elementId => {
         const model = gfx.getElementById(elementId);
         if (model instanceof GfxPrimitiveElementModel) {