diff --git a/src/fe-common/core/fe-windows.c b/src/fe-common/core/fe-windows.c
index 5e1b785e..1e754347 100644
--- a/src/fe-common/core/fe-windows.c
+++ b/src/fe-common/core/fe-windows.c
@@ -308,7 +308,7 @@ WINDOW_REC *window_find_item(SERVER_REC *server, const char *name)
 	if (item == NULL)
 		return 0;
 
-	return MODULE_DATA(item);
+	return window_item_window(item);
 }
 
 int window_refnum_prev(int refnum, int wrap)
diff --git a/src/fe-common/core/window-items.c b/src/fe-common/core/window-items.c
index 3d820dda..c24b111a 100644
--- a/src/fe-common/core/window-items.c
+++ b/src/fe-common/core/window-items.c
@@ -90,7 +90,7 @@ void window_item_change_server(WI_ITEM_REC *item, void *server)
 
 	g_return_if_fail(item != NULL);
 
-	window = MODULE_DATA(item);
+	window = window_item_window(item);
 	item->server = server;
 
         signal_emit("window item server changed", 2, window, item);