diff --git a/src/renderer/components/TimelineSpace.vue b/src/renderer/components/TimelineSpace.vue
index 96ec6858..c3dadcef 100644
--- a/src/renderer/components/TimelineSpace.vue
+++ b/src/renderer/components/TimelineSpace.vue
@@ -4,7 +4,8 @@
   v-loading="loading"
   element-loading-text="Loading..."
   element-loading-spinner="el-icon-loading"
-  element-loading-background="rgba(0, 0, 0, 0.8)">
+  element-loading-background="rgba(0, 0, 0, 0.8)"
+  >
   <side-menu></side-menu>
   <div :class="collapse ? 'page-narrow':'page'">
     <header class="header" style="-webkit-app-region: drag;">
@@ -13,6 +14,7 @@
     <contents></contents>
   </div>
   <modals></modals>
+  <receive-drop v-show="droppableVisible"></receive-drop>
 </div>
 </template>
 
@@ -23,10 +25,17 @@ import HeaderMenu from './TimelineSpace/HeaderMenu'
 import Contents from './TimelineSpace/Contents'
 import Modals from './TimelineSpace/Modals'
 import Mousetrap from 'mousetrap'
+import ReceiveDrop from './TimelineSpace/ReceiveDrop'
 
 export default {
   name: 'timeline-space',
-  components: { SideMenu, HeaderMenu, Modals, Contents },
+  components: { SideMenu, HeaderMenu, Modals, Contents, ReceiveDrop },
+  data () {
+    return {
+      dropTarget: null,
+      droppableVisible: false
+    }
+  },
   computed: {
     ...mapState({
       loading: state => state.TimelineSpace.loading,
@@ -42,11 +51,19 @@ export default {
       })
   },
   mounted () {
+    window.addEventListener('dragenter', this.onDragEnter)
+    window.addEventListener('dragleave', this.onDragLeave)
+    window.addEventListener('dragover', this.onDragOver)
+    window.addEventListener('drop', this.handleDrop)
     Mousetrap.bind(['command+t', 'ctrl+t'], () => {
       this.$store.commit('TimelineSpace/Modals/Jump/changeModal', true)
     })
   },
   beforeDestroy () {
+    window.removeEventListener('dragenter', this.onDragEnter)
+    window.removeEventListener('dragleave', this.onDragLeave)
+    window.removeEventListener('dragover', this.onDragOver)
+    window.removeEventListener('drop', this.handleDrop)
     this.$store.dispatch('TimelineSpace/stopUserStreaming')
     this.$store.dispatch('TimelineSpace/stopLocalStreaming')
   },
@@ -103,6 +120,44 @@ export default {
           })
         })
       this.$store.dispatch('TimelineSpace/startLocalStreaming', account)
+    },
+    handleDrop (e) {
+      e.preventDefault()
+      e.stopPropagation()
+      this.droppableVisible = false
+      if (e.dataTransfer.files.item(0) === null || e.dataTransfer.files.item(0) === undefined) {
+        return false
+      }
+      const file = e.dataTransfer.files.item(0)
+      if (!file.type.includes('image') && !file.type.includes('video')) {
+        this.$message({
+          message: 'You can only attach images or videos',
+          type: 'error'
+        })
+        return false
+      }
+      this.$store.dispatch('TimelineSpace/Modals/NewToot/openModal')
+      this.$store.dispatch('TimelineSpace/Modals/NewToot/incrementMediaId')
+      this.$store.dispatch('TimelineSpace/Modals/NewToot/uploadImage', file)
+        .catch(() => {
+          this.$message({
+            message: 'Could not attach the file',
+            type: 'error'
+          })
+        })
+      return false
+    },
+    onDragEnter (e) {
+      this.dropTarget = e.target
+      this.droppableVisible = true
+    },
+    onDragLeave (e) {
+      if (e.target === this.dropTarget) {
+        this.droppableVisible = false
+      }
+    },
+    onDragOver (e) {
+      e.preventDefault()
     }
   }
 }
diff --git a/src/renderer/components/TimelineSpace/Modals/NewToot.vue b/src/renderer/components/TimelineSpace/Modals/NewToot.vue
index 7a4d8b74..246ee79f 100644
--- a/src/renderer/components/TimelineSpace/Modals/NewToot.vue
+++ b/src/renderer/components/TimelineSpace/Modals/NewToot.vue
@@ -21,7 +21,7 @@
     <div slot="footer" class="dialog-footer">
       <div class="upload-image">
         <el-button size="small" type="text" @click="selectImage"><icon name="camera"></icon></el-button>
-        <input name="image" type="file" class="image-input" ref="image" @change="onChangeImage" :key="attachedImageId"/>
+        <input name="image" type="file" class="image-input" ref="image" @change="onChangeImage" :key="attachedMediaId"/>
       </div>
       <div class="privacy">
         <el-dropdown trigger="click" @command="changeVisibility">
@@ -60,7 +60,6 @@ export default {
   name: 'new-toot',
   data () {
     return {
-      attachedImageId: 0,
       showContentWarning: false
     }
   },
@@ -74,6 +73,7 @@ export default {
         }
       },
       attachedMedias: state => state.TimelineSpace.Modals.NewToot.attachedMedias,
+      attachedMediaId: state => state.TimelineSpace.Modals.NewToot.attachedMediaId,
       blockSubmit: state => state.TimelineSpace.Modals.NewToot.blockSubmit,
       visibility: state => state.TimelineSpace.Modals.NewToot.visibility,
       sensitive: state => state.TimelineSpace.Modals.NewToot.sensitive,
@@ -131,15 +131,9 @@ export default {
       }
     }
   },
-  mounted () {
-    document.addEventListener('drop', this.onDrop)
-  },
-  destroyed () {
-    document.removeEventListener('drop', this.onDrop)
-  },
   methods: {
     close () {
-      this.resetImage()
+      this.$store.dispatch('TimelineSpace/Modals/NewToot/resetMediaId')
       this.$store.dispatch('TimelineSpace/Modals/NewToot/closeModal')
     },
     toot () {
@@ -217,7 +211,7 @@ export default {
       this.updateImage(file)
     },
     updateImage (file) {
-      this.resetImage()
+      this.$store.dispatch('TimelineSpace/Modals/NewToot/incrementMediaId')
       this.$store.dispatch('TimelineSpace/Modals/NewToot/uploadImage', file)
         .catch(() => {
           this.$message({
@@ -229,31 +223,11 @@ export default {
     removeAttachment (media) {
       this.$store.commit('TimelineSpace/Modals/NewToot/removeMedia', media)
     },
-    resetImage () {
-      ++this.attachedImageId
-    },
     changeVisibility (level) {
       this.$store.commit('TimelineSpace/Modals/NewToot/changeVisibility', level)
     },
     changeSensitive () {
       this.$store.commit('TimelineSpace/Modals/NewToot/changeSensitive', !this.sensitive)
-    },
-    onDrop (e) {
-      e.preventDefault()
-      e.stopPropagation()
-      if (e.dataTransfer.files.item(0) === null || e.dataTransfer.files.item(0) === undefined) {
-        return false
-      }
-      const file = e.dataTransfer.files.item(0)
-      if (!file.type.includes('image') && !file.type.includes('video')) {
-        this.$message({
-          message: 'You can only attach images or videos',
-          type: 'error'
-        })
-        return false
-      }
-      this.updateImage(file)
-      return false
     }
   }
 }
diff --git a/src/renderer/components/TimelineSpace/ReceiveDrop.vue b/src/renderer/components/TimelineSpace/ReceiveDrop.vue
new file mode 100644
index 00000000..77cd8470
--- /dev/null
+++ b/src/renderer/components/TimelineSpace/ReceiveDrop.vue
@@ -0,0 +1,48 @@
+<template>
+<div id="receive_drop">
+  <div class="drop-area">
+    <div class="drop-message">
+      <h1>Drop to Upload to Mastodon</h1>
+    </div>
+  </div>
+</div>
+</template>
+
+<script>
+export default {
+  name: 'receive-drop'
+}
+</script>
+
+<style lang="scss" scoped>
+#receive_drop {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: 4000;
+  background-color: rgba(0, 0, 0, 0.5);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  .drop-area {
+    width: 80%;
+    height: 80%;
+    border: 4px dotted #ffffff;
+    border-radius: 12px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    .drop-message {
+      text-align: center;
+
+      h1 {
+        font-size: 42px;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/renderer/store/TimelineSpace/Modals/NewToot.js b/src/renderer/store/TimelineSpace/Modals/NewToot.js
index 5de5cbb7..28b27d3b 100644
--- a/src/renderer/store/TimelineSpace/Modals/NewToot.js
+++ b/src/renderer/store/TimelineSpace/Modals/NewToot.js
@@ -11,7 +11,8 @@ const NewToot = {
     attachedMedias: [],
     visibility: 'public',
     sensitive: false,
-    spoiler: ''
+    spoiler: '',
+    attachedMediaId: 0
   },
   mutations: {
     changeModal (state, value) {
@@ -43,6 +44,9 @@ const NewToot = {
     },
     updateSpoiler (state, value) {
       state.spoiler = value
+    },
+    updateMediaId (state, value) {
+      state.attachedMediaId = value
     }
   },
   actions: {
@@ -105,6 +109,12 @@ const NewToot = {
           console.error(err)
           throw err
         })
+    },
+    incrementMediaId ({ commit, state }) {
+      commit('updateMediaId', state.attachedMediaId + 1)
+    },
+    resetMediaId ({ commit }) {
+      commit('updateMediaId', 0)
     }
   }
 }