diff --git a/userspace/gui/basic/game.c b/userspace/gui/basic/game.c
index c2d7218a..963ff523 100644
--- a/userspace/gui/basic/game.c
+++ b/userspace/gui/basic/game.c
@@ -258,7 +258,10 @@ char handle_event(yutani_msg_t * m) {
 int main(int argc, char ** argv) {
 
 	yctx = yutani_init();
-	window = yutani_window_create(yctx, 2 * WINDOW_SIZE, 2 * WINDOW_SIZE);
+
+	init_decorations();
+
+	window = yutani_window_create(yctx, 2 * WINDOW_SIZE + decor_width(), 2 * WINDOW_SIZE + decor_height());
 	yutani_window_move(yctx, window, 100, 100);
 	ctx = init_graphics_yutani_double_buffer(window);
 	draw_fill(ctx,rgb(0,0,0));
@@ -267,8 +270,6 @@ int main(int argc, char ** argv) {
 
 	yutani_window_advertise_icon(yctx, window, "RPG Demo", "applications-simulation");
 
-	init_decorations();
-
 	map_x = WINDOW_SIZE - (64 * 9) / 2;
 	map_y = WINDOW_SIZE - (64 * 9) / 2;