diff --git a/firestarter b/firestarter
index 746bae9..ead8760 100755
--- a/firestarter
+++ b/firestarter
@@ -377,33 +377,36 @@ step_preexecute() {
 		# Disabled here because an XDGCD of KDE implies kded and other KDE parts, breaking copypasta and other things
 		#export XDG_CURRENT_DESKTOP="KDE"
 	fi
-	# xhost
-	if has xhost; then
-		if xhost +si:localuser:"$(id -un)" >/dev/null 2>&1; then
-			log "Session open to other sessions by this user"
-		else
-			warn "Failed to open session via xhost"
+	# X-specific stuff
+	if [ -n "$DISPLAY" ]; then
+		# xhost
+		if has xhost; then
+			if xhost +si:localuser:"$(id -un)" >/dev/null 2>&1; then
+				log "Session open to other sessions by this user"
+			else
+				warn "Failed to open session via xhost"
+			fi
 		fi
-	fi
-	# xresources
-	if [ -n "$DISPLAY" ] && has xrdb && [ -r "$HOME/.Xresources" ]; then
-		if xrdb "$HOME/.Xresources" >/dev/null 2>&1; then
-			log "Loaded in .Xresources"
-		else
-			warn "Failed to load .Xresources"
+		# xresources
+		if has xrdb && [ -r "$HOME/.Xresources" ]; then
+			if xrdb "$HOME/.Xresources" >/dev/null 2>&1; then
+				log "Loaded in .Xresources"
+			else
+				warn "Failed to load .Xresources"
+			fi
+		fi
+		# xsetroot
+		if has xsetroot; then
+			log "Setting root window properties"
+			xsetroot -cursor_name left_ptr
+		fi
+		# xset
+		if has xset; then
+			log "Disabling bell"
+			xset -b
+			log "Disabling DPMS"
+			xset s off -dpms 
 		fi
-	fi
-	# xsetroot
-	if has xsetroot; then
-		log "Setting root window properties"
-		xsetroot -cursor_name left_ptr
-	fi
-	# xset
-	if has xset; then
-		log "Disabling bell"
-		xset -b
-		log "Disabling DPMS"
-		xset s off -dpms 
 	fi
 }
 step_postexecute() {