diff --git a/src/win.c b/src/win.c
index ae730d2..fe9a8bb 100644
--- a/src/win.c
+++ b/src/win.c
@@ -226,17 +226,10 @@ bool win_bind_image(session_t *ps, win *w) {
 }
 
 bool win_try_rebind_image(session_t *ps, win *w) {
-	void *new_image, *new_shadow;
-	if (!_win_bind_image(ps, w, &new_image, &new_shadow)) {
-		return false;
-	}
-
 	log_trace("Freeing old window image");
 	win_release_image(ps->backend_data, w);
 
-	w->shadow_image = new_shadow;
-	w->win_image = new_image;
-	return true;
+	return win_bind_image(ps, w);
 }
 
 /**
diff --git a/src/win.h b/src/win.h
index 39f9e17..cdab3e6 100644
--- a/src/win.h
+++ b/src/win.h
@@ -291,7 +291,7 @@ void win_release_image(backend_t *base, win *w);
 bool must_use win_bind_image(session_t *ps, win *w);
 
 /// Attempt a rebind of window's images. If that failed, the original images are kept.
-bool win_try_rebind_image(session_t *ps, win *w);
+bool must_use win_try_rebind_image(session_t *ps, win *w);
 int win_get_name(session_t *ps, win *w);
 int win_get_role(session_t *ps, win *w);
 winmode_t attr_pure win_calc_mode(const win *w);