diff --git a/ChangeLog b/ChangeLog
index 83e72be..9648a89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-18  Pierre-Luc Paour <gallery@paour.com> (1.4.2-b7)
+
+	* More fixes for crop UI.
+
 2004-10-15  Pierre-Luc Paour <gallery@paour.com> (1.4.2-b6)
 
 	* Fixed crop area being cached between different pictures.
diff --git a/com/gallery/GalleryRemote/PreviewFrame.java b/com/gallery/GalleryRemote/PreviewFrame.java
index f1edbf4..b2d6dc0 100755
--- a/com/gallery/GalleryRemote/PreviewFrame.java
+++ b/com/gallery/GalleryRemote/PreviewFrame.java
@@ -459,6 +459,7 @@ public void mouseClicked(MouseEvent e) {
 			}
 
 			currentPicture.setCropTo(null);
+			cacheRect = null;
 			repaint();
 		}
 
@@ -471,6 +472,10 @@ public void mousePressed(MouseEvent e) {
 				return;
 			}
 
+			if (cacheRect == null) {
+				movingEdge = 0;
+			}
+
 			inDrag = true;
 
 			switch (movingEdge) {
@@ -535,6 +540,10 @@ public void mouseDragged(MouseEvent e) {
 				return;
 			}
 
+			if (cacheRect == null) {
+				movingEdge = 0;
+			}
+
 			int modifiers = e.getModifiersEx();
 
 			Point2D p;
@@ -621,6 +630,8 @@ public void mouseDragged(MouseEvent e) {
 
 		public void mouseMoved(MouseEvent e) {
 			if (currentPicture == null || currentImage == null || currentPicture.isOnline() || cacheRect == null) {
+				movingEdge = 0;
+				setCursor(Cursor.getDefaultCursor());
 				return;
 			}
 
diff --git a/defaults.properties b/defaults.properties
index 9606cfc..029000f 100644
--- a/defaults.properties
+++ b/defaults.properties
@@ -242,6 +242,6 @@ updateUrlBeta=http://gallery.sourceforge.net/gallery_remote_version_check_beta.p
 #
 # --- Do not edit below this line ---
 #
-version=1.4.2-b6
-releaseDate=2004/10/15
+version=1.4.2-b7
+releaseDate=2004/10/18
 aboutText=Gallery Remote\n \n \nA part of the Gallery Open-Source Project\nhttp://gallery.sourceforge.net\n \n \nMaintained by:\n \nPierre-Luc Paour\n \n \nInitial version by Chris Smith\n \n \nContributors:\n \nTim Miller\nDolan Halbrook\nMarkus Cozowicz\nScott Gartner\nAmedeo Paglione\nChris Schwerdt\nSeth Ladd\n \n \nArtwork by Ross A. Reyman\n \n \nBundled software:\n \nImageMagick\nJava look and feel Graphics Repository icons\njpegtran, Guido Vollbeding's version\nMetadataExtractor