diff --git a/CHANGELOG.md b/CHANGELOG.md
index eef1345c9611a9c3df5852592dcf13b554a04b67..551c93ddf3c5e1d7e9375a63996b0058d64a9cb5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
 - リレー向けのActivityが一部実装で除外されてしまうことがあるのを修正
 - 削除したノートやユーザーがリモートから参照されると復活することがあるのを修正
 - クライアント: ページ編集時のドロップダウンメニューなどが動作しない問題を修正
+- クライアント: コントロールパネルのカスタム絵文字タブが切り替わらないように見える問題を修正
 
 ## 12.94.1 (2021/10/25)
 
diff --git a/src/client/pages/admin/emojis.vue b/src/client/pages/admin/emojis.vue
index 80e0e00ba92b1c130bbee70b79620db36f1e4cbc..f5952f93b8232e3bebeba22213a8220f7143e647 100644
--- a/src/client/pages/admin/emojis.vue
+++ b/src/client/pages/admin/emojis.vue
@@ -48,7 +48,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent } from 'vue';
+import { computed, defineComponent, toRef } from 'vue';
 import MkButton from '@client/components/ui/button.vue';
 import MkInput from '@client/components/form/input.vue';
 import MkPagination from '@client/components/ui/pagination.vue';
@@ -112,7 +112,7 @@ export default defineComponent({
 	},
 
 	async mounted() {
-		this.$emit('info', this[symbols.PAGE_INFO]);
+		this.$emit('info', toRef(this, symbols.PAGE_INFO));
 	},
 
 	methods: {
diff --git a/src/client/pages/admin/index.vue b/src/client/pages/admin/index.vue
index cda3ab912a617789a41a7f7027458c2030266b20..28157ff05a2e78c57ab3a114afe12cbc418dda17 100644
--- a/src/client/pages/admin/index.vue
+++ b/src/client/pages/admin/index.vue
@@ -26,7 +26,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineAsyncComponent, defineComponent, nextTick, onMounted, reactive, ref, watch } from 'vue';
+import { computed, defineAsyncComponent, defineComponent, isRef, nextTick, onMounted, reactive, ref, watch } from 'vue';
 import { i18n } from '@client/i18n';
 import MkSuperMenu from '@client/components/ui/super-menu.vue';
 import FormGroup from '@client/components/debobigego/group.vue';
@@ -73,7 +73,13 @@ export default defineComponent({
 		const view = ref(null);
 		const el = ref(null);
 		const onInfo = (viewInfo) => {
-			childInfo.value = viewInfo;
+			if (isRef(viewInfo)) {
+				watch(viewInfo, () => {
+					childInfo.value = viewInfo.value;
+				}, { immediate: true });
+			} else {
+				childInfo.value = viewInfo;
+			}
 		};
 		const pageProps = ref({});