diff --git a/rtgui/cropwindow.h b/rtgui/cropwindow.h
index 5a69154d1..59b7129fc 100644
--- a/rtgui/cropwindow.h
+++ b/rtgui/cropwindow.h
@@ -66,7 +66,7 @@ class CropWindow : public LWButtonListener, public CropHandlerListener {
         int xpos, ypos, width, height;
         
         // image handling
-        CropHandler cropHandler;
+      
         ImageArea* iarea;
         int cropZoom; // *1000
         
@@ -88,6 +88,7 @@ class CropWindow : public LWButtonListener, public CropHandlerListener {
         void        getObservedFrameArea(int& x, int& y, int& w, int& h);
     
     public:
+        CropHandler cropHandler;
         CropWindow (ImageArea* parent, rtengine::StagedImageProcessor* ipc_);
         ~CropWindow ();
         
diff --git a/rtgui/editorpanel.cc b/rtgui/editorpanel.cc
index e4b662c4e..c351534ea 100644
--- a/rtgui/editorpanel.cc
+++ b/rtgui/editorpanel.cc
@@ -323,12 +323,11 @@ void EditorPanel::open (Thumbnail* tmb, rtengine::InitialImage* isrc) {
         beforeAfterToggled();
     }
 
-    Gtk::Allocation r;
-    iarea->imageArea->on_resized(r);
-    //iarea->show_all();
-    //hpanedl->show_all();
-    //show_all();
-
+    if (iarea->imageArea->mainCropWindow)
+    {
+        iarea->imageArea->mainCropWindow->cropHandler.newImage(ipc);            
+        iarea->imageArea->mainCropWindow->initialImageArrived();
+    }
 }
 
 void EditorPanel::close () {
@@ -351,8 +350,8 @@ void EditorPanel::close () {
 //        delete beforePreviewHandler;
 //        beforePreviewHandler = NULL;
 
-        delete iarea->imageArea->mainCropWindow;
-        iarea->imageArea->mainCropWindow = NULL;
+      //  delete iarea->imageArea->mainCropWindow;
+       // iarea->imageArea->mainCropWindow = NULL;
 
         rtengine::StagedImageProcessor::destroy (ipc);
         ipc = NULL;