diff --git a/src/main-process/atom-window.coffee b/src/main-process/atom-window.coffee
index d358ac93f..2efac9290 100644
--- a/src/main-process/atom-window.coffee
+++ b/src/main-process/atom-window.coffee
@@ -46,9 +46,6 @@ class AtomWindow
     @browserWindow = new BrowserWindow options
     global.atomApplication.addWindow(this)
 
-    if @applyTitleBarSetting()
-      @browserWindow.setSheetOffset(23)
-
     @handleEvents()
 
     loadSettings = Object.assign({}, settings)
diff --git a/src/title-bar-element.coffee b/src/title-bar-element.coffee
index 39deada10..8bc397a41 100644
--- a/src/title-bar-element.coffee
+++ b/src/title-bar-element.coffee
@@ -1,7 +1,7 @@
 
 module.exports =
 class TitleBarElement extends HTMLElement
-  initialize: (@model, {@views, @workspace, @project, @config, @styles}) ->
+  initialize: (@model, {@workspace, @themes, @applicationDelegate}) ->
 
     @classList.add('title-bar')
 
@@ -11,12 +11,15 @@ class TitleBarElement extends HTMLElement
     @appendChild @titleElement
 
     @workspace.onDidChangeActivePaneItem => @updateTitle()
+    @themes.onDidChangeActiveThemes => @setSheetOffset()
 
     @updateTitle()
-
     return this
 
-  updateTitle: =>
+  setSheetOffset: ->
+    @applicationDelegate.getCurrentWindow().setSheetOffset(@offsetHeight)
+
+  updateTitle: ->
     @titleElement.textContent = document.title
 
 module.exports = TitleBarElement = document.registerElement 'atom-title-bar', prototype: TitleBarElement.prototype