diff --git a/src/components/stage/stage.css b/src/components/stage/stage.css
index f13554a02..9c784e956 100644
--- a/src/components/stage/stage.css
+++ b/src/components/stage/stage.css
@@ -1,4 +1,5 @@
 @import "../../css/units.css";
+@import "../../css/colors.css";
 
 .stage {
     /*
@@ -7,8 +8,6 @@
     */
     display: block;
 
-    border-radius: $space;
-
     /* @todo: This is for overriding the value being set somewhere. Where is it being set? */
     background-color: transparent;
 }
@@ -31,6 +30,10 @@
 
 .stage-wrapper {
     position: relative;
+    border-radius: $space;
+    border: 1px solid $ui-pane-border;
+    /* Keep the canvas inside the border radius */
+    overflow: hidden;
 }
 
 .monitor-wrapper, .color-picker-wrapper {