diff --git a/src/components/MailTable.vue b/src/components/MailTable.vue
index d9af5b6..cc1ab63 100644
--- a/src/components/MailTable.vue
+++ b/src/components/MailTable.vue
@@ -20,7 +20,7 @@
     </tbody>
 
     <portal target="#modal-portal">
-      <ModalView :isOpened="!!openedEmail" :closeModal="() => {openedEmail = null;}">
+      <ModalView v-if="!!openedEmail" :closeModal="() => {openedEmail = null;}">
         <MailView :email="openedEmail" />
       </ModalView>
     </portal>
diff --git a/src/components/MailView.vue b/src/components/MailView.vue
index 0263b8c..add111a 100644
--- a/src/components/MailView.vue
+++ b/src/components/MailView.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="email">
+  <div class="email" v-if="email">
     <div>From: {{email.from}}</div>
     <div>Subject: <strong>{{email.subject}}</strong></div>
     <div v-html="emailMarkdown" />
diff --git a/src/components/ModalView.vue b/src/components/ModalView.vue
index c841ff1..b2dc4aa 100644
--- a/src/components/ModalView.vue
+++ b/src/components/ModalView.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="modal" v-if="isOpened">
+  <div class="modal">
     <div class="overlay" @click="closeModal()"></div>
     <div class="modal-card">
       <slot :closeModal="closeModal" />
@@ -17,7 +17,6 @@
     },
     methods: {
       onkey(event){
-        if(!this.isOpened) { return null }
 
         if(event.key == 'Escape') {
           this.closeModal()
@@ -25,10 +24,6 @@
       }
     },
     props: {
-      isOpened: {
-        type: Boolean,
-        required: true
-      },
       closeModal: {
         type: Function,
         required: true