diff --git a/public/assets/css/base.css b/public/assets/css/base.css
index c6cc6bae5e..f99f59833b 100644
--- a/public/assets/css/base.css
+++ b/public/assets/css/base.css
@@ -409,11 +409,15 @@ summary:hover .icon-details-open {
     background-color: var(--translucent);
     padding: var(--small-size);
 
-    width: auto;
-    height: auto;
     max-width: 100%;
 }
 
+.note-attachments > figure > img,
+.note-attachments > figure > video {
+    width: min-content;
+    height: auto;
+}
+
 .note-attachments > figure figcaption {
     display: flex;
     max-width: 100%;
@@ -758,6 +762,8 @@ input[type=file] {
     height: calc(100% - 3rem);
 
     padding: var(--unit-size);
+
+    overflow-y: auto;
 }