diff --git a/src/bin/ephoto_main.c b/src/bin/ephoto_main.c
index 732f3f8..49904d2 100644
--- a/src/bin/ephoto_main.c
+++ b/src/bin/ephoto_main.c
@@ -19,6 +19,7 @@ _ephoto_flow_browser_delete_cb(void *data, Evas_Object *obj, void *event_info)
 				       _ephoto_thumb_browser_selected_cb,
 				       NULL);
 	em->state = EPHOTO_STATE_THUMB;
+	em->flow_browser = NULL;
 }
 
 static void 
diff --git a/src/bin/ephoto_thumb_browser.c b/src/bin/ephoto_thumb_browser.c
index 0dd4143..eec0ba6 100644
--- a/src/bin/ephoto_thumb_browser.c
+++ b/src/bin/ephoto_thumb_browser.c
@@ -353,21 +353,6 @@ _ephoto_grid_del(const void *data, Evas_Object *obj)
 /*Thumb clicked job*/
 static void
 _ephoto_thumb_clicked_job(void *data)
-{
-	const char *file;
-
-	file = data;
-	
-	/* evas_object_smart_callback_call(ef->flow_browser, "selected", file); */
-
-	/* em->flow_browser = ephoto_create_flow_browser(em->layout); */
-	/* ephoto_flow_browser_image_set(em->flow_browser, file); */
-	/* elm_layout_content_set(em->layout, "ephoto.content.swallow", em->flow_browser); */
-}
-
-/*Check to see if the thumbnail was double clicked*/
-static void 
-_ephoto_thumb_clicked(void *data, Evas_Object *obj, void *event_info)
 {
 	const Eina_List *selected;
 	Ephoto_Thumb_Data *etd;
@@ -378,7 +363,13 @@ _ephoto_thumb_clicked(void *data, Evas_Object *obj, void *event_info)
 	o = eina_list_data_get(selected);
 	etd = (Ephoto_Thumb_Data *)elm_gengrid_item_data_get((Elm_Gengrid_Item *)o);
 	evas_object_smart_callback_call(tb->layout, "selected", (char *)etd->file);
-	//	ecore_job_add(_ephoto_thumb_clicked_job, etd->file);
+}
+
+/*Check to see if the thumbnail was double clicked*/
+static void 
+_ephoto_thumb_clicked(void *data, Evas_Object *obj, void *event_info)
+{
+	ecore_job_add(_ephoto_thumb_clicked_job, data);
 }
 
 /*File Selector is shown*/
@@ -526,5 +517,7 @@ _ephoto_del_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 		eina_stringshare_del(etd->file);
 		free(etd);
 	}
-	ethumb_client_disconnect(tb->ec);
+	if (tb->ec)
+		ethumb_client_disconnect(tb->ec);
+	em->thumb_browser = NULL;
 }