diff --git a/src/pages/Gallery.vue b/src/pages/Gallery.vue
index 24f2204..61ab68d 100644
--- a/src/pages/Gallery.vue
+++ b/src/pages/Gallery.vue
@@ -44,18 +44,26 @@
 
 
     <b-modal
-      v-if="creation && creation.iframeUrl"
+      v-if="creation && (creation.iframeUrl || creation.mediaItem)"
       :id="'modal-creation' + creation.id"
       class="modal-creation"
       static hide-footer hide-header
     >
       <template #default="{ hide, visible }">
         <button-expand expanded @click="hide()" />
-        <iframe
-          v-if="visible"
-          :src="creation.iframeUrl"
-          width="100%" height="100%"
-        />
+        <template v-if="visible">
+          <iframe
+            v-if="creation.iframeUrl"
+            :src="creation.iframeUrl"
+            width="100%" height="100%"
+          />
+          <component
+            v-else-if="creation.mediaItem"
+            :is="creation.mediaItem.is"
+            :src="creation.mediaItem.url"
+            controls
+          />
+        </template>
       </template>
     </b-modal>
 
@@ -226,6 +234,7 @@ export default {
 
     &-body {
       padding: 0;
+      display: flex;
     }
 
     &-backdrop {
@@ -241,6 +250,16 @@ export default {
       top: 0;
       right: 0;
     }
+
+    audio {
+      width: 80%;
+      margin: auto;
+    }
+
+    video {
+      width: 100%;
+      height: 100%;
+    }
   }
 }
 </style>
diff --git a/src/store/nodes.js b/src/store/nodes.js
index 4dfd051..6bdb781 100644
--- a/src/store/nodes.js
+++ b/src/store/nodes.js
@@ -46,6 +46,11 @@ export default {
               node.iframeUrl = node.files[0].url + '#toolbar=0&navpanes=0&statusbar=0'
             } else if (mime === 'text/html') {
               node.iframeUrl = node.files[0].url
+            } else if (['audio', 'video'].some(type => mime.includes(type))) {
+              node.mediaItem = {
+                is: mime.includes('audio') ? 'audio' : 'video',
+                src: node.files[0].url
+              }
             } else if (node.piece && node.piece.url) {
               node.iframeUrl = node.piece.url
             }