--- src/empathy.c	2014-08-28 12:08:19.000000000 +0200
+++ src/empathy.c	2015-03-21 13:14:34.140659282 +0100
@@ -251,30 +251,30 @@
     {
       DEBUG ("GNOME Shell is running, don't create status icon");
 
-      /* Rely on GNOME Shell to watch session state */
-      empathy_presence_manager_set_auto_away (self->presence_mgr, FALSE);
-
       empathy_roster_window_set_shell_running (
           EMPATHY_ROSTER_WINDOW (self->window), TRUE);
     }
   else
     {
-      gboolean autoaway;
-
       self->icon = empathy_status_icon_new (GTK_WINDOW (self->window),
           self->start_hidden);
 
-      /* Allow Empathy to watch session state */
-      autoaway = g_settings_get_boolean (self->gsettings,
-          EMPATHY_PREFS_AUTOAWAY);
-
-      g_signal_connect (self->gsettings,
-          "changed::" EMPATHY_PREFS_AUTOAWAY,
-          G_CALLBACK (empathy_presence_manager_set_auto_away_cb),
-          self->presence_mgr);
-
-      empathy_presence_manager_set_auto_away (self->presence_mgr, autoaway);
     }
+
+  gboolean autoaway;
+
+
+  /* Allow Empathy to watch session state */
+  autoaway = g_settings_get_boolean (self->gsettings,
+      EMPATHY_PREFS_AUTOAWAY);
+
+  g_signal_connect (self->gsettings,
+      "changed::" EMPATHY_PREFS_AUTOAWAY,
+      G_CALLBACK (empathy_presence_manager_set_auto_away_cb),
+      self->presence_mgr);
+
+  empathy_presence_manager_set_auto_away (self->presence_mgr, autoaway);
+
 }
 
 static void
