diff --git a/litex/build/xilinx/programmer.py b/litex/build/xilinx/programmer.py
index 64f718605..0ad0abac4 100644
--- a/litex/build/xilinx/programmer.py
+++ b/litex/build/xilinx/programmer.py
@@ -139,8 +139,8 @@ def _run_vivado(path, ver, cmds):
                 break
             else:
                 raise OSError("Unable to locate Vivado directory or settings.")
-            vivado_cmd += "source " + settings
-        vivado_cmd += " && vivado -mode tcl"
+            vivado_cmd += "source " + settings + " && "
+        vivado_cmd += "vivado -mode tcl"
     with subprocess.Popen(vivado_cmd, stdin=subprocess.PIPE, shell=True) as process:
         process.stdin.write(cmds.encode("ASCII"))
         process.communicate()