diff --git a/mailnag b/mailnag
index 6a137fc..db3248c 100755
--- a/mailnag
+++ b/mailnag
@@ -3,7 +3,7 @@
 #
 # mailnag
 #
-# Copyright 2011 - 2014 Patrick Ulbrich <zulu99@gmx.net>
+# Copyright 2011 - 2016 Patrick Ulbrich <zulu99@gmx.net>
 # Copyright 2011 Leighton Earl <leighton.earl@gmx.com>
 # Copyright 2011 Ralf Hersel <ralf.hersel@gmx.net>
 #
@@ -32,9 +32,13 @@ import logging.handlers
 import os
 import signal
 
+from Mailnag.common.utils import fix_cwd
+
+fix_cwd()
+
 from Mailnag.common.config import cfg_exists
 from Mailnag.common.dist_cfg import APP_VERSION
-from Mailnag.common.utils import set_procname, shutdown_existing_instance, fix_cwd
+from Mailnag.common.utils import set_procname, shutdown_existing_instance
 from Mailnag.common.subproc import terminate_subprocesses
 from Mailnag.common.exceptions import InvalidOperationException
 from Mailnag.daemon.mailnagdaemon import MailnagDaemon
@@ -102,8 +106,6 @@ def sigterm_handler(mainloop):
 
 
 def main():
-	fix_cwd()
-	
 	mainloop = GLib.MainLoop()
 	daemon = None
 	
diff --git a/mailnag-config b/mailnag-config
index 964820f..9e50c52 100755
--- a/mailnag-config
+++ b/mailnag-config
@@ -3,7 +3,7 @@
 #
 # mailnag-config
 #
-# Copyright 2011 - 2014 Patrick Ulbrich <zulu99@gmx.net>
+# Copyright 2011 - 2016 Patrick Ulbrich <zulu99@gmx.net>
 # Copyright 2011 Ralf Hersel <ralf.hersel@gmx.net>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -27,13 +27,16 @@ import subprocess
 from gi.repository import Gtk
 from dbus.mainloop.glib import DBusGMainLoop
 
-from Mailnag.common.utils import set_procname, shutdown_existing_instance, fix_cwd
+from Mailnag.common.utils import fix_cwd
+
+fix_cwd()
+
+from Mailnag.common.utils import set_procname, shutdown_existing_instance
 from Mailnag.common.dist_cfg import BIN_DIR
 from Mailnag.configuration.configwindow import ConfigWindow
 
 
 def main():
-	fix_cwd()
 	set_procname("mailnag-config")
 	confwin = ConfigWindow()
 	Gtk.main()