diff --git a/src/bin/ephoto.h b/src/bin/ephoto.h
index 8bbe28d..9706e97 100644
--- a/src/bin/ephoto.h
+++ b/src/bin/ephoto.h
@@ -74,6 +74,7 @@ struct _Ephoto
 	Evas_Object *flow;
 	Evas_Object *sel;
 	Eina_List *images;
+	int maximized;
 };
 extern Ephoto *em;
 
diff --git a/src/bin/ephoto_main.c b/src/bin/ephoto_main.c
index 529b87f..05b0c76 100644
--- a/src/bin/ephoto_main.c
+++ b/src/bin/ephoto_main.c
@@ -3,6 +3,7 @@
 /*General Callbacks */
 static void window_close(Ecore_Evas *ee);
 static void window_resize(Ecore_Evas *ee);
+static void window_move(Ecore_Evas *ee);
 static void window_shown(void *data, Evas *e, Evas_Object *obj, void *event_info);
 
 /*Ephoto Main Global*/
@@ -13,12 +14,14 @@ void create_main_window(void)
 {
 	em = calloc(1, sizeof(Ephoto));
 	em->sel = NULL;
+	em->maximized = 0;
 
 	em->ee = ecore_evas_software_x11_new(0, 0, 0, 0, 955, 540);
 	ecore_evas_title_set(em->ee, "Ephoto");
 	ecore_evas_name_class_set(em->ee, "Ephoto", "Ephoto");
 	ecore_evas_callback_destroy_set(em->ee, window_close);
 	ecore_evas_callback_resize_set(em->ee, window_resize);
+	ecore_evas_callback_move_set(em->ee, window_move);
 	ecore_evas_show(em->ee);
 
 	em->e = ecore_evas_get(em->ee);
@@ -62,3 +65,20 @@ static void window_resize(Ecore_Evas *ee)
 	evas_object_move(em->bg, 0, 0);
 }
 
+static void window_move(Ecore_Evas *ee)
+{
+	int w, h;
+
+	if (ecore_evas_maximized_get(em->ee) != em->maximized)
+	{
+		evas_object_geometry_get(em->bg, 0, 0, &w, &h);
+		if (evas_object_visible_get(em->image_browser))
+			evas_object_resize(em->image_browser, w, h);
+		if (evas_object_visible_get(em->flow))
+			evas_object_resize(em->flow, w, h);
+		em->maximized = ecore_evas_maximized_get(em->ee);
+	}
+
+	return;
+}
+