diff --git a/src/main-process/atom-application.coffee b/src/main-process/atom-application.coffee
index 8d1509e38..afd267106 100644
--- a/src/main-process/atom-application.coffee
+++ b/src/main-process/atom-application.coffee
@@ -84,6 +84,12 @@ class AtomApplication
   initialize: (options) ->
     global.atomApplication = this
 
+    # DEPRECATED: This can be removed at some point (added in 1.13)
+    # It converts `useCustomTitleBar: true` to `titleBar: "custom"`
+    if process.platform is 'darwin' and @config.get('core.useCustomTitleBar')
+      @config.unset('core.useCustomTitleBar')
+      @config.set('core.titleBar', 'custom')
+    
     @config.onDidChange 'core.titleBar', @promptForRestart.bind(this)
 
     @autoUpdateManager = new AutoUpdateManager(