diff --git a/apps/file-browser.c b/apps/file-browser.c
index 97ae5762..e532a2c2 100644
--- a/apps/file-browser.c
+++ b/apps/file-browser.c
@@ -174,7 +174,7 @@ static void draw_file(struct File * f, int offset) {
 	int center_x_text = (FILE_WIDTH - name_width) / 2;
 	draw_sprite(contents, icon, center_x_icon + x, y + 2);
 
-	if (f->selected && (!is_desktop_background || main_window->focused)) {
+	if (f->selected) {
 		/* If this file is selected, paint the icon blue... */
 		if (main_window->focused) {
 			draw_sprite_alpha_paint(contents, icon, center_x_icon + x, y + 2, 0.5, rgb(72,167,255));
diff --git a/apps/package-manager.c b/apps/package-manager.c
index 258d980b..e529f338 100644
--- a/apps/package-manager.c
+++ b/apps/package-manager.c
@@ -103,7 +103,11 @@ static void draw_package(struct Package * package, int index) {
 	int offset_y = index * PKG_HEIGHT;
 
 	if (package->selected) {
-		draw_rectangle_solid(contents, 0, offset_y, contents->width, PKG_HEIGHT, rgb(0,120,220));
+		if (main_window->focused) {
+			draw_rectangle_solid(contents, 0, offset_y, contents->width, PKG_HEIGHT, rgb(0,120,220));
+		} else {
+			draw_rectangle_solid(contents, 0, offset_y, contents->width, PKG_HEIGHT, rgb(180,180,180));
+		}
 	}
 
 	sprite_t * icon = package->installed ? icon_get_48("package") : icon_get_48("package-uninstalled");
@@ -119,6 +123,8 @@ static void draw_package(struct Package * package, int index) {
 }
 
 static void redraw_packages(void) {
+	draw_fill(contents, rgba(0,0,0,0));
+
 	for (int i = 0; i < pkg_pointers_len; ++i) {
 		draw_package(pkg_pointers[i], i);
 	}
@@ -232,8 +238,6 @@ static void reinitialize_contents(void) {
 	contents_sprite = create_sprite(main_window->width - bounds.width, calculated_height, ALPHA_EMBEDDED);
 	contents = init_graphics_sprite(contents_sprite);
 
-	draw_fill(contents, rgba(0,0,0,0));
-
 	/* Draw packages */
 	redraw_packages();
 }
@@ -436,6 +440,7 @@ int main(int argc, char * argv[]) {
 						yutani_window_t * win = hashmap_get(yctx->windows, (void*)wf->wid);
 						if (win == main_window) {
 							win->focused = wf->focused;
+							redraw_packages();
 							redraw_window();
 						}
 					}