diff --git a/data/extensions/aseprite-theme/dark/theme.xml b/data/extensions/aseprite-theme/dark/theme.xml
index 485823f0a..a6e63bc73 100644
--- a/data/extensions/aseprite-theme/dark/theme.xml
+++ b/data/extensions/aseprite-theme/dark/theme.xml
@@ -519,6 +519,10 @@
             <background color="tooltip_face" />
             <text color="tooltip_text" align="left" />
         </style>
+        <style id="textbox_text" align="left top wordwrap" border="4">
+            <background color="textbox_face" />
+            <text color="textbox_text" align="left" />
+        </style>
         <style id="label" padding="1">
             <text color="text" align="left" />
             <text color="disabled" align="left" state="disabled" />
diff --git a/data/extensions/aseprite-theme/theme.xml b/data/extensions/aseprite-theme/theme.xml
index 23afd730e..4b7788ee8 100644
--- a/data/extensions/aseprite-theme/theme.xml
+++ b/data/extensions/aseprite-theme/theme.xml
@@ -512,6 +512,10 @@
             <background color="tooltip_face" />
             <text color="tooltip_text" align="left" />
         </style>
+        <style id="textbox_text" align="left top wordwrap" border="4">
+            <background color="textbox_face" />
+            <text color="textbox_text" align="left" />
+        </style>
         <style id="label" padding="1">
             <text color="text" align="left" />
             <text color="disabled" align="left" state="disabled" />
diff --git a/src/app/ui/skin/skin_theme.cpp b/src/app/ui/skin/skin_theme.cpp
index 45768fb1a..d0e1f9c9f 100644
--- a/src/app/ui/skin/skin_theme.cpp
+++ b/src/app/ui/skin/skin_theme.cpp
@@ -913,9 +913,8 @@ void SkinTheme::initWidget(Widget* widget)
       break;
 
     case kTextBoxWidget:
-      BORDER(4*guiscale());
       widget->setChildSpacing(0);
-      widget->setBgColor(colors.textboxFace());
+      widget->setStyle(styles.textboxText());
       break;
 
     case kViewWidget:
diff --git a/src/ui/manager.cpp b/src/ui/manager.cpp
index 28412aee9..6958d489f 100644
--- a/src/ui/manager.cpp
+++ b/src/ui/manager.cpp
@@ -1931,7 +1931,7 @@ bool Manager::sendMessageToWidget(Message* msg, Widget* widget)
     // Restore overlays in the region that we're going to paint.
     OverlayManager::instance()->restoreOverlappedAreas(paintMsg->rect());
 
-    os::Surface* surface = display->surface();
+    os::SurfaceRef surface(base::AddRef(display->surface()));
     surface->saveClip();
 
     if (surface->clipRect(paintMsg->rect())) {
diff --git a/src/ui/theme.cpp b/src/ui/theme.cpp
index 499bbce67..5f52271cb 100644
--- a/src/ui/theme.cpp
+++ b/src/ui/theme.cpp
@@ -294,10 +294,9 @@ void Theme::paintTooltip(Graphics* g,
   }
 }
 
-gfx::Size Theme::paintTextBoxWithStyle(Graphics* g,
-                                       const Widget* widget)
+void Theme::paintTextBoxWithStyle(Graphics* g,
+                                  const Widget* widget)
 {
-  gfx::Size size;
   gfx::Color bg = gfx::ColorNone, fg = gfx::ColorNone;
 
   for_each_layer(
@@ -311,9 +310,7 @@ gfx::Size Theme::paintTextBoxWithStyle(Graphics* g,
     });
 
   if (fg != gfx::ColorNone)
-    Theme::drawTextBox(g, widget, &size.w, &size.h, bg, fg);
-
-  return size;
+    Theme::drawTextBox(g, widget, nullptr, nullptr, bg, fg);
 }
 
 void Theme::paintLayer(Graphics* g,
diff --git a/src/ui/theme.h b/src/ui/theme.h
index e04750d6d..fe5349af2 100644
--- a/src/ui/theme.h
+++ b/src/ui/theme.h
@@ -101,8 +101,8 @@ namespace ui {
                               const int arrowAlign,
                               const gfx::Rect& target);
 
-    gfx::Size paintTextBoxWithStyle(Graphics* g,
-                                    const Widget* widget);
+    void paintTextBoxWithStyle(Graphics* g,
+                               const Widget* widget);
 
     virtual gfx::Size calcSizeHint(const Widget* widget,
                                    const Style* style);