diff --git a/utils/system_daemon/file_manager.cpp b/utils/system_daemon/file_manager.cpp
index 4d87e1b9..f8e0e9ab 100644
--- a/utils/system_daemon/file_manager.cpp
+++ b/utils/system_daemon/file_manager.cpp
@@ -31,7 +31,10 @@ bool FileManager::TileDir::keyEvent(PIKbdListener::KeyEvent key) {
 	case PIKbdListener::F8:
 		if (selected.isEmpty())
 			selected << cur;
-		if (!askQuestion("Delete selected?")) return false;
+		if (!askQuestion("Delete selected?")) {
+			setFocus();
+			return false;
+		}
 		setFocus();
 		if (!remote) {
 			PIStringList sl;
@@ -39,6 +42,7 @@ bool FileManager::TileDir::keyEvent(PIKbdListener::KeyEvent key) {
 			piForeachC (int i, sind)
 				sl << entries[i].name();
 			removeFiles(dir, sl);
+			selected.clear();
 			updateDir();
 		}
 		pass = true;
@@ -149,6 +153,7 @@ void FileManager::TileDir::buildNames() {
 				t = '*';
 			} else {
 				t = ' ';
+				cc = Default;
 				cf = 0;
 			}
 			scol = PIString::readableSize(e.size);