diff --git a/sake b/sake
index 65d9af3394a..59103445b54 100755
--- a/sake
+++ b/sake
@@ -42,7 +42,7 @@ fi
 
 # Find the PHP binary
 for candidatephp in php php5; do
-	if [ `which $candidatephp 2>/dev/null` -a -f `which $candidatephp 2>/dev/null` ]; then
+	if [ "`which $candidatephp 2>/dev/null`" -a -f "`which $candidatephp 2>/dev/null`" ]; then
 		php=`which $candidatephp 2>/dev/null`
 		break
 	fi
@@ -116,4 +116,4 @@ fi
 ################################################################################################
 ## Basic execution
 
-$php $framework/cli-script.php ${*}
+"$php" "$framework/cli-script.php" "${@}"
diff --git a/src/Forms/SearchableDropdownTrait.php b/src/Forms/SearchableDropdownTrait.php
index 7d93f04c1eb..97923f711d0 100644
--- a/src/Forms/SearchableDropdownTrait.php
+++ b/src/Forms/SearchableDropdownTrait.php
@@ -397,7 +397,6 @@ public function saveInto(DataObjectInterface $record): void
                     $record->$classNameField = $ids ? $record->ClassName : '';
                 }
             }
-            $record->write();
         } else {
             // has_many / many_many field
             if (!method_exists($record, 'hasMethod')) {