diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js b/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
index c575ba01c..941973b27 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
+++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
@@ -64,7 +64,7 @@ describe('ContributionMessagesFormular', () => {
             text: 'text form message',
           },
         })
-        await wrapper.find('[data-test="submit-dialog"]').trigger('click')
+        await wrapper.find('form').trigger('submit')
       })
 
       it('emitted "get-list-contribution-messages" with data', async () => {
@@ -84,7 +84,7 @@ describe('ContributionMessagesFormular', () => {
       beforeEach(async () => {
         apolloMutateMock.mockRejectedValue({ message: 'OUCH!' })
         wrapper = Wrapper()
-        await wrapper.find('[data-test="submit-dialog"]').trigger('submit')
+        await wrapper.find('form').trigger('submit')
       })
 
       it('toasts an error message', () => {
@@ -100,11 +100,12 @@ describe('ContributionMessagesFormular', () => {
           },
         })
         wrapper = Wrapper()
-        await wrapper.find('data-test="submit-dialog').trigger('submit')
+        await wrapper.find('form').trigger('submit')
+        wrapper.vm.$nextTick()
       })
 
       it('moderatorMesage has `DIALOG`', () => {
-        expect(wrapper.vm.messageType).toBeCalledWith('DIALOG')
+        expect(wrapper.vm.messageType.DIALOG).toBe('DIALOG')
       })
 
       it('toasts an success message', () => {
diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
index 68a58ec08..056db4508 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="contribution-messages-formular">
     <div class="mt-5">
-      <b-form @reset.prevent="onReset">
+      <b-form @reset.prevent="onReset" @submit="onSubmit(messageType.DIALOG)">
         <b-form-textarea
           id="textarea"
           v-model="form.text"
@@ -12,13 +12,13 @@
           <b-col>
             <b-button type="reset" variant="danger">{{ $t('form.cancel') }}</b-button>
           </b-col>
-          <b-col>
+          <b-col class="text-center">
             <b-button
               type="button"
               variant="warning"
               class="text-black"
               :disabled="disabled"
-              @click="onSubmit('MODERATOR')"
+              @click.prevent="onSubmit(messageType.MODERATOR)"
               data-test="submit-moderator"
             >
               {{ $t('moderator.notice') }}
@@ -30,7 +30,7 @@
               type="submit"
               variant="primary"
               :disabled="disabled"
-              @click="onSubmit('DIALOG')"
+              @click.prevent="onSubmit(messageType.DIALOG)"
               data-test="submit-dialog"
             >
               {{ $t('form.submit') }}
@@ -58,6 +58,10 @@ export default {
         text: '',
       },
       loading: false,
+      messageType: {
+        DIALOG: 'DIALOG',
+        MODERATOR: 'MODERATOR',
+      },
     }
   },
   methods: {
diff --git a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
index 67a42433e..4492fa88f 100644
--- a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
+++ b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
@@ -64,9 +64,9 @@ export default {
       return this.message.type === 'HISTORY'
     },
     boxClass() {
-      if (this.isModeratorMessage) return 'is-moderator is-moderator-message'
       if (this.isModeratorHiddenMessage) return 'is-moderator is-moderator-hidden-message'
       if (this.isHistory) return 'is-user is-user-history-message'
+      if (this.isModeratorMessage) return 'is-moderator is-moderator-message'
       return 'is-user is-user-message'
     },
   },