diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js
index 56acdc93e..dff1ca112 100644
--- a/app/assets/javascripts/notes.js
+++ b/app/assets/javascripts/notes.js
@@ -130,6 +130,14 @@ Danbooru.Note = {
         height: $note_box.height() - 2,
         width: $note_box.width() - 2
       });
+
+      if ($inner_border.width() >= $note_box.width() - 2) {
+        $note_box.width($inner_border.width() + 2);
+      }
+
+      if ($inner_border.height() >= $note_box.height() - 2) {
+        $note_box.height($inner_border.height() + 2);
+      }
     },
 
     scale: function($note_box) {
diff --git a/app/assets/stylesheets/specific/notes.css.scss b/app/assets/stylesheets/specific/notes.css.scss
index dd1deb55d..8ed5d236b 100644
--- a/app/assets/stylesheets/specific/notes.css.scss
+++ b/app/assets/stylesheets/specific/notes.css.scss
@@ -74,7 +74,8 @@ div#note-container {
 
   div.note-box.embedded div.note-box-inner-border {
     text-align: center;
-    word-wrap: break-word;
+    display: table-cell;
+    vertical-align: middle;
   }
 }