diff --git a/editors/editoria/src/layout/EditorElements.js b/editors/editoria/src/layout/EditorElements.js
index 811dbc87217c9eab49c2d0f3df211a0c666af4ed..8c0fdee23853c0d1eea6504a05aefb48b8805375 100644
--- a/editors/editoria/src/layout/EditorElements.js
+++ b/editors/editoria/src/layout/EditorElements.js
@@ -29,8 +29,7 @@ export default css`
     h3 span::selection,
     h4 span::selection,
     code span::selection,
-    custom-tag-block::selection,
-    custom-tag-inline::selection {
+    figcaption span::selection {
       background-color: transparent;
     }
 
diff --git a/wax-prosemirror-plugins/src/images/captionPlugin.js b/wax-prosemirror-plugins/src/images/captionPlugin.js
index ea7acd9fffe6cd7aa57e5a9fa2c53de99fa6ddb0..e4176614103ad406e0db7d132785f618c576c208 100644
--- a/wax-prosemirror-plugins/src/images/captionPlugin.js
+++ b/wax-prosemirror-plugins/src/images/captionPlugin.js
@@ -81,7 +81,7 @@ const captionPlugin = key =>
             );
           }
 
-          return true;
+          return false;
         },
         keyup(view, e) {
           // delete caption if figure is deleted