diff --git a/src/components/popover/popover.scss b/src/components/popover/popover.scss
index 57a5250a7..9cc9552fe 100644
--- a/src/components/popover/popover.scss
+++ b/src/components/popover/popover.scss
@@ -54,6 +54,7 @@
     grid-template-columns: 1fr;
     grid-auto-flow: column;
     grid-auto-columns: auto;
+    grid-gap: 0.5em;
 
     .popover-wrapper {
       box-sizing: border-box;
diff --git a/src/components/status_action_buttons/action_button.js b/src/components/status_action_buttons/action_button.js
index 32e3bd6e1..87c5bb1e5 100644
--- a/src/components/status_action_buttons/action_button.js
+++ b/src/components/status_action_buttons/action_button.js
@@ -65,7 +65,7 @@ export default {
     'getClass',
     'getComponent',
     'doAction',
-    'close'
+    'outerClose'
   ],
   components: {
     StatusBookmarkFolderMenu,
diff --git a/src/components/status_action_buttons/action_button.vue b/src/components/status_action_buttons/action_button.vue
index 105af5caf..9e25764c0 100644
--- a/src/components/status_action_buttons/action_button.vue
+++ b/src/components/status_action_buttons/action_button.vue
@@ -14,7 +14,7 @@
       :tabindex="0"
       :disabled="buttonClass.disabled"
       :href="getComponent(button) == 'a' ? button.link?.(funcArg) || remoteInteractionLink : undefined"
-      @click="doActionWrap(button, close)"
+      @click="doActionWrap(button, outerClose)"
     >
       <FALayers>
         <FAIcon
@@ -84,10 +84,11 @@
           fixed-width
         />
       </template>
-      <template #content>
+      <template #content="{close}">
         <StatusBookmarkFolderMenu
           v-if="button.name === 'bookmark'"
           :status="status"
+          :close="() => { close(); outerClose() }"
         />
       </template>
     </Popover>
diff --git a/src/components/status_action_buttons/status_action_buttons.vue b/src/components/status_action_buttons/status_action_buttons.vue
index bcd16b11b..6d5cd190c 100644
--- a/src/components/status_action_buttons/status_action_buttons.vue
+++ b/src/components/status_action_buttons/status_action_buttons.vue
@@ -86,7 +86,7 @@
                 :func-arg="funcArg"
                 :get-class="getClass"
                 :get-component="getComponent"
-                :close="close"
+                :outerClose="close"
                 :do-action="doAction"
               />
               <button
diff --git a/src/components/status_bookmark_folder_menu/status_bookmark_folder_menu.js b/src/components/status_bookmark_folder_menu/status_bookmark_folder_menu.js
index 50bcb0ca3..573134909 100644
--- a/src/components/status_bookmark_folder_menu/status_bookmark_folder_menu.js
+++ b/src/components/status_bookmark_folder_menu/status_bookmark_folder_menu.js
@@ -2,19 +2,22 @@ import { library } from '@fortawesome/fontawesome-svg-core'
 import { faChevronRight, faFolder } from '@fortawesome/free-solid-svg-icons'
 import { mapState } from 'vuex'
 
-import Popover from '../popover/popover.vue'
+import Popover from 'src/components/popover/popover.vue'
+import StillImage from 'src/components/still-image/still-image.vue'
 
 library.add(faChevronRight, faFolder)
 
 const StatusBookmarkFolderMenu = {
   props: [
-    'status'
+    'status',
+    'close'
   ],
   data () {
     return {}
   },
   components: {
-    Popover
+    Popover,
+    StillImage
   },
   computed: {
     ...mapState({
diff --git a/src/components/status_bookmark_folder_menu/status_bookmark_folder_menu.scss b/src/components/status_bookmark_folder_menu/status_bookmark_folder_menu.scss
new file mode 100644
index 000000000..f450e9cd1
--- /dev/null
+++ b/src/components/status_bookmark_folder_menu/status_bookmark_folder_menu.scss
@@ -0,0 +1,9 @@
+.bookmark-folder-menu {
+  --__horizontal-gap: 0.5em;
+  --_still-image-label-visibility: hidden;
+
+  .emoji {
+    width: var(--__line-height);
+    height: var(--__line-height);
+  }
+}
diff --git a/src/components/status_bookmark_folder_menu/status_bookmark_folder_menu.vue b/src/components/status_bookmark_folder_menu/status_bookmark_folder_menu.vue
index 75f389946..25dc7e23f 100644
--- a/src/components/status_bookmark_folder_menu/status_bookmark_folder_menu.vue
+++ b/src/components/status_bookmark_folder_menu/status_bookmark_folder_menu.vue
@@ -1,22 +1,25 @@
 <template>
-  <div class="dropdown-menu">
+  <div class="dropdown-menu bookmark-folder-menu">
     <div
       v-for="folder in folders"
       :key="folder.id"
-      class="menu-item dropdown-item -icon"
+      class="menu-item dropdown-item -icon-double"
     >
       <button
         class="main-button"
         @click="toggleFolder(folder.id)"
+        @click.stop="close"
       >
         <span
           class="input menu-checkbox -radio"
           :class="{ 'menu-checkbox-checked': status.bookmark_folder_id == folder.id }"
         />
-        {{ folder.name }}
+        <StillImage :src="folder.emoji_url" class="emoji" />
+        {{ ' ' + folder.name }}
       </button>
     </div>
   </div>
 </template>
 
 <script src="./status_bookmark_folder_menu.js"></script>
+<stlye src="./status_bookmark_folder_menu.scss" />