diff --git a/cmd-split-window.c b/cmd-split-window.c
index e65a0296..662bce40 100644
--- a/cmd-split-window.c
+++ b/cmd-split-window.c
@@ -101,12 +101,17 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item)
 		flags |= SPAWN_FULLSIZE;
 
 	input = args_has(args, 'I');
-	empty = (count == 1 && *args_string(args, 0) == '\0');
-	if (!empty && (input || args_has(args, 'E'))) {
+	if (input)
+		empty = 1;
+	else
+		empty = args_has(args, 'E');
+	if (empty &&
+	    count != 0 &&
+	    (count != 1 || *args_string(args, 0) != '\0')) {
 		cmdq_error(item, "command cannot be given for empty pane");
 		return (CMD_RETURN_ERROR);
 	}
-	if (input || empty || args_has(args, 'E'))
+	if (empty)
 		flags |= SPAWN_EMPTY;
 
 	if (is_floating)
diff --git a/options-table.c b/options-table.c
index 3bff66b5..d743cdf1 100644
--- a/options-table.c
+++ b/options-table.c
@@ -1028,7 +1028,8 @@ const struct options_table_entry options_table[] = {
 	  .flags = OPTIONS_TABLE_IS_ARRAY,
 	  .default_str = "DISPLAY KRB5CCNAME MSYSTEM SSH_ASKPASS SSH_AUTH_SOCK "
 			 "SSH_AGENT_PID SSH_CONNECTION WAYLAND_DISPLAY "
-			 "WINDOWID XAUTHORITY",
+			 "WINDOWID XAUTHORITY XDG_CURRENT_DESKTOP "
+			 "XDG_SESSION_DESKTOP XDG_SESSION_TYPE",
 	  .text = "List of environment variables to update in the session "
 		  "environment when a client is attached."
 	},