diff --git a/sdk_lib/enter_chroot.sh b/sdk_lib/enter_chroot.sh
index b183920c0d..a6c4a38978 100755
--- a/sdk_lib/enter_chroot.sh
+++ b/sdk_lib/enter_chroot.sh
@@ -381,10 +381,10 @@ setup_env() {
     fi
 
     # Turn off automounting of external media when we enter the chroot by
-    # stopping the gvfs-gdu-volume-monitor. This is currently the most
-    # reliable way to disable automounting.
+    # stopping the gvfs-gdu-volume-monitor and gvfsd-trash daemons. This is
+    # currently the most reliable way to disable automounting.
     # See https://bugzilla.gnome.org/show_bug.cgi?id=677648
-    sudo killall -STOP gvfs-gdu-volume-monitor 2>/dev/null || true
+    sudo killall -STOP gvfs-gdu-volume-monitor gvfsd-trash 2>/dev/null || true
 
     # Configure committer username and email in chroot .gitconfig.  Change
     # to the root directory first so that random $PWD/.git/config settings
@@ -515,7 +515,7 @@ teardown_env() {
       safe_umount_tree "${MOUNTED_PATH}/"
 
       # Now that we've exited the chroot, allow automounting again.
-      sudo killall -CONT gvfs-gdu-volume-monitor 2>/dev/null || true
+      sudo killall -CONT gvfs-gdu-volume-monitor gvfsd-trash 2>/dev/null || true
     fi
   ) 200>>"$LOCKFILE" || die "teardown_env failed"
 }