Fix #1164 and fix showing spinner on delete

@schiesbn @icewind1991 @LukasReschke