diff --git a/app/src/gambas3/.src/Editor/Image/FImageEditor.class b/app/src/gambas3/.src/Editor/Image/FImageEditor.class
index 440d1a83b..855c85638 100644
--- a/app/src/gambas3/.src/Editor/Image/FImageEditor.class
+++ b/app/src/gambas3/.src/Editor/Image/FImageEditor.class
@@ -1655,6 +1655,8 @@ Public Sub imvImage_MouseUp()
   If $bDblClick Then 
     $bDblClick = False
     EndUndo
+    MergeLastUndo
+    ClearSelection
     Return
   Endif
   
@@ -3445,8 +3447,6 @@ End
 
 Public Sub imvImage_DblClick()
 
-  MergeLastUndo
-  ClearSelection
   $bDblClick = True
 
 End