diff --git a/vendor/xdg-open b/vendor/xdg-open
index 13caac1..cb72fc8 100755
--- a/vendor/xdg-open
+++ b/vendor/xdg-open
@@ -555,15 +555,15 @@ search_desktop_file()
         command_exec=`which $command 2>/dev/null`
         arguments="`grep -E "^Exec(\[[^]=]*])?=" "$file" | cut -d= -f 2- | last_word`"
         arg_one="`echo $arg | sed 's/&/\\\\&/g'`"
-        arguments_exec="`echo $arguments | sed -e 's*%[fFuU]*"'"$arg_one"'"*g'`"
+        arguments_exec="`echo $arguments | sed -e 's*%[fFuU]*'"$arg_one"'*g'`"
 
         if [ -x "$command_exec" ] ; then
             if echo $arguments | grep -iq '%[fFuU]' ; then
                 echo START $command_exec $arguments_exec
-                eval $command_exec $arguments_exec
+                eval '$command_exec "$arguments_exec"'
             else
                 echo START $command_exec $arguments_exec "$arg"
-                eval $command_exec $arguments_exec "$arg"
+                eval '$command_exec "$arguments_exec" "$arg"'
             fi
 
             if [ $? -eq 0 ]; then
@@ -656,7 +656,7 @@ open_generic()
             fi
 
             if [ x"$browser_with_arg" = x"$browser" ]; then
-                eval '$browser $1'$xdg_redirect_output;
+                eval '$browser "$1"'$xdg_redirect_output;
             else eval '$browser_with_arg'$xdg_redirect_output;
             fi