diff --git a/src/sview/popups.c b/src/sview/popups.c
index 89c0aaf261637040b4bbea0307614fc1c250ace2..b23f5319264a416bb517b8a3c2f1aefe402ed99b 100644
--- a/src/sview/popups.c
+++ b/src/sview/popups.c
@@ -629,15 +629,16 @@ extern void create_daemon_popup(GtkAction *action, gpointer user_data)
 	}
 	slurm_conf_unlock();
 
-	if ((n = slurm_conf_get_nodename(me))) {
-		d = 1;
-		xfree(n);
-	} else if ((n = slurm_conf_get_aliased_nodename())) {
-		d = 1;
-		xfree(n);
-	} else if ((n = slurm_conf_get_nodename("localhost"))) {
-		d = 1;
+	if ((n = slurm_conf_get_nodename(me))) {
+		d = 1;
 		xfree(n);
+	} else if ((n = slurm_conf_get_aliased_nodename())) {
+		d = 1;
+		xfree(n);
+	} else if ((n = slurm_conf_get_nodename("localhost"))) {
+		d = 1;
+		xfree(n);
+	}
 	if (actld && ctld)
 		add_display_treestore_line(update, treestore, &iter, 
 					   "Slurmctld", "1");