2 files changed, 3 insertions, 2 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java
index eece063376..9a81a05264 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java
@@ -2663,9 +2663,9 @@ public static void setAppName (String name) {
 //TODO use custom timer instead of timerExec
 Runnable hoverTimer = new Runnable () {
 	public void run () {
-		if (currentControl != null && currentControl != null) {
+		if (currentControl != null && !currentControl.isDisposed()) {
 			currentControl.sendMouseEvent (null, SWT.MouseHover, trackingControl != null);
-		}		
+		}
 	}
 };
 //TODO - use custom timer instead of timerExec
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Shell.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Shell.java
index 9514c2b5f9..0f7e81e680 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Shell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Shell.java
@@ -1007,6 +1007,7 @@ void setBounds (int x, int y, int width, int height, boolean move, boolean resiz
 		} else {
 			if (resize) {
 				NSRect rect = window.frame();
+				rect.y += rect.height - height;
 				rect.width = width;
 				rect.height = height;
 				window.setFrame_display_(rect, false);