diff --git a/ChangeLog b/ChangeLog
index 7d389d196..c35b80ecf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2013-05-08 Mike Blumenkrantz
 
         * e_fm2_optimal_size_calc returns bool to indicate whether the returned size can be used
+        * filemanager windows no longer resize to 0x0 when double clicked with no icons present
 
 2013-04-26 Mike Blumenkrantz
 
diff --git a/NEWS b/NEWS
index 612440d3f..949d05396 100644
--- a/NEWS
+++ b/NEWS
@@ -209,3 +209,4 @@ Fixes:
     * fixed pointer warp when pointer was inside warp window but not directly over it
     * toolbar gadgets no longer crash when trying to display a popup
     * fixed theme bug which prevented windows from unshading correctly when animations were disabled
+    * filemanager windows no longer resize to 0x0 when double clicked with no icons present
diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c
index 07bbf46fd..0661aa6fc 100644
--- a/src/modules/fileman/e_fwin.c
+++ b/src/modules/fileman/e_fwin.c
@@ -618,7 +618,7 @@ _e_fwin_bg_mouse_down(E_Fwin *fwin, Evas_Object *obj __UNUSED__, void *event __U
    int x, y, w, h, zx, zy, zw, zh;
    e_zone_useful_geometry_get(fwin->win->border->zone, &zx, &zy, &zw, &zh);
    x = fwin->win->border->x, y = fwin->win->border->y;
-   e_fm2_optimal_size_calc(fwin->cur_page->fm_obj, zw - x, zh - y, &w, &h);
+   if (!e_fm2_optimal_size_calc(fwin->cur_page->fm_obj, zw - x, zh - y, &w, &h)) return;
    if (x + w > zx + zw)
      w = zx + zw - x;
    if (y + x > zy + zh)