diff --git a/src/workspace-element.coffee b/src/workspace-element.coffee
index b3366225c..686674cde 100644
--- a/src/workspace-element.coffee
+++ b/src/workspace-element.coffee
@@ -26,11 +26,10 @@ class WorkspaceElement extends HTMLElement
     @classList.add 'workspace'
     @setAttribute 'tabindex', -1
 
-
-    @verticalAxis = document.createElement('div')
+    @verticalAxis = document.createElement('atom-workspace-axis')
     @verticalAxis.classList.add('vertical')
 
-    @horizontalAxis = document.createElement('div')
+    @horizontalAxis = document.createElement('atom-workspace-axis')
     @horizontalAxis.classList.add('horizontal')
     @horizontalAxis.appendChild(@verticalAxis)
 
diff --git a/static/workspace-view.less b/static/workspace-view.less
index 58c10c2b5..f99d5865e 100644
--- a/static/workspace-view.less
+++ b/static/workspace-view.less
@@ -28,14 +28,14 @@ atom-workspace {
   background-color: @app-background-color;
   font-family: @font-family;
 
-  > .horizontal {
+  atom-workspace-axis.horizontal {
     display: -webkit-flex;
     height: 100%;
+  }
 
-    > .vertical {
-      display: -webkit-flex;
-      -webkit-flex: 1;
-      -webkit-flex-flow: column;
-    }
+  atom-workspace-axis.vertical {
+    display: -webkit-flex;
+    -webkit-flex: 1;
+    -webkit-flex-flow: column;
   }
 }