diff --git a/x11docker b/x11docker
index d1571772..ca71e19b 100755
--- a/x11docker
+++ b/x11docker
@@ -2641,13 +2641,14 @@ create_xcommand() {             # create command to start X server and/or Waylan
     --xpra|--xpra-xwayland)
 
       Xpraoptions="$(check_xpraoption --start-via-proxy=no) \\
+  $(check_xpraoption --clipboard-direction=both) \\
   $(check_xpraoption --microphone=no) \\
   $(check_xpraoption --notifications=no) \\
   $(check_xpraoption --pulseaudio=no) \\
-  $(check_xpraoption --socket-dirs="'$Cachefolder'")"
+  $(check_xpraoption --socket-dirs="'$Cachefolder'") \\
   $(check_xpraoption --speaker=no) \\
   $(check_xpraoption --webcam=no) \\
-  $(check_xpraoption --xsettings=no) \\
+  $(check_xpraoption --xsettings=no)"
       
       # disable --dpi for buggy versions
       [ -n "$Dpi" ] && verlt "$Xpraversion" "xpra v2.1-r16547" && ! verlt "$Xpraversion" "xpra v2.1" &&  Dpi=""
@@ -2657,13 +2658,13 @@ create_xcommand() {             # create command to start X server and/or Waylan
   $(check_xpraoption --keyboard-layout="'$Xkblayout'") \\
   $(check_xpraoption --keyboard-raw=yes)"
   
-#      Xpraoptions="$Xpraoptions \\
-#  $(check_xpraoption --debug=all)"
+#      Xpraoptions="$Xpraoptions  $(check_xpraoption --debug=all)"
   
       # xpra server command
       [ "$Desktopmode" = "yes" ] && Xpraservercommand="xpra start-desktop" || Xpraservercommand="xpra start"
       Xpraservercommand="$Xpraservercommand :$Newdisplaynumber --use-display \\
   $Xpraoptions \\
+  $(check_xpraoption --clipboard=yes) \\
   $(check_xpraoption --dbus-proxy=no) \\
   $(check_xpraoption --daemon=no) \\
   $(check_xpraoption --fake-xinerama=no) \\
@@ -2681,6 +2682,7 @@ create_xcommand() {             # create command to start X server and/or Waylan
       # xpra client command
       Xpraclientcommand="xpra attach :$Newdisplaynumber \\
   $Xpraoptions \\
+  $(check_xpraoption --clipboard=$Shareclipboard) \\
   $(check_xpraoption --compress=0) \\
   $(check_xpraoption --quality=100) \\
   $(check_xpraoption --modal-windows=no)"
@@ -2692,12 +2694,6 @@ create_xcommand() {             # create command to start X server and/or Waylan
   $(check_xpraoption --dpi="'$Dpi'")"
       [ "$Xpraborder" ] && Xpraclientcommand="$Xpraclientcommand \\
   $(check_xpraoption --border=$Xpraborder)"
-      case $Shareclipboard in
-        yes) Xpraclientcommand="$Xpraclientcommand \\
-  $(check_xpraoption --clipboard=yes)"    ;;
-        no)  Xpraclientcommand="$Xpraclientcommand \\
-  $(check_xpraoption --clipboard=no)" ;;
-      esac
       case $X11dockermode in
         run)
           case "$Desktopmode" in