diff --git a/bin/xpanes b/bin/xpanes
index 25ce5f0..8a9ef06 100755
--- a/bin/xpanes
+++ b/bin/xpanes
@@ -775,20 +775,18 @@ xpns_organize_panes() {
   local _window_name="$1"
   shift
   local _args_num="$1"
-  ## ----------------
+
   # Default behavior
-  ## ----------------
-  if [[ "${_args_num}" -eq 1 ]]; then
-    ${TMUX_XPANES_EXEC} select-layout -t "${_window_name}" even-horizontal
-  elif [[ "${_args_num}" -gt 1 ]]; then
-    ${TMUX_XPANES_EXEC} select-layout -t "${_window_name}" tiled
+  local layout_command=" select-layout -t ${_window_name} even-horizontal"
+  if ((_args_num > 1)); then
+    layout_command=" select-layout -t ${_window_name} tiled"
   fi
-  ## ----------------
   # Update layout
-  ## ----------------
   if [[ "${XP_LAYOUT}" != "${XP_DEFAULT_LAYOUT}" ]]; then
-    ${TMUX_XPANES_EXEC} select-layout -t "${_window_name}" "${XP_LAYOUT}"
+    layout_command=" select-layout -t ${_window_name} ${XP_LAYOUT}"
   fi
+  # shellcheck disable=SC2086
+  ${TMUX_XPANES_EXEC} $layout_command
 }
 
 #