diff --git a/sway/container.c b/sway/container.c
index ef0e6c55..d6bcc4c2 100644
--- a/sway/container.c
+++ b/sway/container.c
@@ -403,7 +403,7 @@ swayc_t *swayc_by_test(swayc_t *container, bool (*test)(swayc_t *view, void *dat
 }
 
 static bool test_name(swayc_t *view, void *data) {
-	if (!view && !view->name) {
+	if (!view || !view->name) {
 		return false;
 	}
 	return strcmp(view->name, data) == 0;
diff --git a/sway/handlers.c b/sway/handlers.c
index 096df53c..15fa6521 100644
--- a/sway/handlers.c
+++ b/sway/handlers.c
@@ -331,7 +331,7 @@ static bool handle_key(wlc_handle view, uint32_t time, const struct wlc_modifier
 		struct sway_binding *binding = mode->bindings->items[i];
 
 		if ((modifiers->mods ^ binding->modifiers) == 0) {
-			bool match;
+			bool match = false;
 			int j;
 			for (j = 0; j < binding->keys->length; ++j) {
 				xkb_keysym_t *key = binding->keys->items[j];