diff --git a/src/debug.c b/src/debug.c
index 37ac533c..ceabbd54 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -3,6 +3,7 @@
 #include <wlr/types/wlr_scene.h>
 #include "common/graphic-helpers.h"
 #include "common/scene-helpers.h"
+#include "common/string-helpers.h"
 #include "debug.h"
 #include "input/ime.h"
 #include "labwc.h"
@@ -69,7 +70,7 @@ get_view_part(struct view *view, struct wlr_scene_node *node)
 	}
 	if (node == &view->scene_tree->node) {
 		const char *app_id = view_get_string_prop(view, "app_id");
-		if (!app_id) {
+		if (!string_null_or_empty(app_id)) {
 			return "view";
 		}
 		snprintf(view_name, sizeof(view_name), "view (%s)", app_id);
diff --git a/src/desktop-entry.c b/src/desktop-entry.c
index fe5c2379..b4bc9d94 100644
--- a/src/desktop-entry.c
+++ b/src/desktop-entry.c
@@ -280,6 +280,10 @@ struct lab_img *
 desktop_entry_icon_lookup(struct server *server, const char *app_id, int size,
 		float scale)
 {
+	if (string_null_or_empty(app_id)) {
+		return NULL;
+	}
+
 	struct sfdo *sfdo = server->sfdo;
 	if (!sfdo) {
 		return NULL;
@@ -328,6 +332,10 @@ desktop_entry_icon_lookup(struct server *server, const char *app_id, int size,
 const char *
 desktop_entry_name_lookup(struct server *server, const char *app_id)
 {
+	if (string_null_or_empty(app_id)) {
+		return NULL;
+	}
+
 	struct sfdo *sfdo = server->sfdo;
 	if (!sfdo) {
 		return NULL;
diff --git a/src/osd-field.c b/src/osd-field.c
index 926f908f..8da1933d 100644
--- a/src/osd-field.c
+++ b/src/osd-field.c
@@ -37,7 +37,7 @@ get_app_id_or_class(struct view *view, bool trim)
 	const char *identifier = view_get_string_prop(view, "app_id");
 
 	/* remove the first two nodes of 'org.' strings */
-	if (trim && identifier && !strncmp(identifier, "org.", 4)) {
+	if (trim && !strncmp(identifier, "org.", 4)) {
 		char *p = (char *)identifier + 4;
 		p = strchr(p, '.');
 		if (p) {
diff --git a/src/view.c b/src/view.c
index 209dd7fa..344bc05b 100644
--- a/src/view.c
+++ b/src/view.c
@@ -2352,12 +2352,7 @@ void
 view_update_title(struct view *view)
 {
 	assert(view);
-	const char *title = view_get_string_prop(view, "title");
-	if (!title) {
-		return;
-	}
 	ssd_update_title(view->ssd);
-
 	wl_signal_emit_mutable(&view->events.new_title, NULL);
 }
 
@@ -2365,15 +2360,9 @@ void
 view_update_app_id(struct view *view)
 {
 	assert(view);
-	const char *app_id = view_get_string_prop(view, "app_id");
-	if (!app_id) {
-		return;
-	}
-
 	if (view->ssd_enabled) {
 		ssd_update_window_icon(view->ssd);
 	}
-
 	wl_signal_emit_mutable(&view->events.new_app_id, NULL);
 }