diff --git a/src/output.c b/src/output.c
index 49199a03..0ea204ea 100644
--- a/src/output.c
+++ b/src/output.c
@@ -11,9 +11,9 @@
 #include <wlr/types/wlr_output_damage.h>
 #include <wlr/util/region.h>
 #include "labwc.h"
+#include "layers.h"
 #include "menu/menu.h"
 #include "theme.h"
-#include "layers.h"
 
 //#define DEBUG 1
 
diff --git a/src/xdg.c b/src/xdg.c
index b5a7e87f..3c85fa38 100644
--- a/src/xdg.c
+++ b/src/xdg.c
@@ -121,18 +121,9 @@ handle_request_resize(struct wl_listener *listener, void *data)
 static void
 handle_request_maximize(struct wl_listener *listener, void *data)
 {
-	/* This event is raised when a client would like to begin an interactive
-	 * resize, typically because the user clicked on their client-side
-	 * decorations. Note that a more sophisticated compositor should check
-	 * the provied serial against a list of button press serials sent to
-	 * this
-	 * client, to prevent the client from requesting this whenever they want.
-	 */
-
 	struct view *view = wl_container_of(listener, view, request_maximize);
-
 	struct wlr_xdg_surface *surface = data;
-	if(view != NULL) {
+	if (view) {
 		view_maximize(view, surface->toplevel->client_pending.maximized);
 	}
 
@@ -284,7 +275,7 @@ xdg_surface_new(struct wl_listener *listener, void *data)
 	view->type = LAB_XDG_SHELL_VIEW;
 	view->impl = &xdg_toplevel_view_impl;
 	view->xdg_surface = xdg_surface;
-	view->maximized = false;
+	view_maximize(view, xdg_surface->toplevel->client_pending.maximized);
 
 	view->map.notify = handle_map;
 	wl_signal_add(&xdg_surface->events.map, &view->map);
@@ -304,10 +295,5 @@ xdg_surface_new(struct wl_listener *listener, void *data)
 	view->request_maximize.notify = handle_request_maximize;
 	wl_signal_add(&toplevel->events.request_maximize, &view->request_maximize);
 
-	// hacky workaround to bug where sometimes a window starts maximized and
-	// when we hit the maximize button, labwc crashes. instead we unmaximize
-	// it from the start to avoid this situation
-	view_maximize(view, false);
-
 	wl_list_insert(&server->views, &view->link);
 }