diff --git a/Sources/CDiffWindow.cpp b/Sources/CDiffWindow.cpp
index 42ad678..6462dd5 100644
--- a/Sources/CDiffWindow.cpp
+++ b/Sources/CDiffWindow.cpp
@@ -396,6 +396,10 @@ void CDiffWindow::Work()
 		}
 		
 		ArrangeWindows();
+
+		fScript->Select(0);
+		fScript->MakeFocus(true);
+		Activate();
 	}
 	catch (HErr& e)
 	{
diff --git a/Sources/PApp.cpp b/Sources/PApp.cpp
index c50bd4c..b227260 100644
--- a/Sources/PApp.cpp
+++ b/Sources/PApp.cpp
@@ -646,8 +646,9 @@ void PApp::ArgvReceived(int32 argc, const char *argv[], const char * cwd)
 		}
 
 		if (invokeDiff == 2) {
-			// Size doesn't matter here as the window will be resized right away.
-			BRect r(0, 0, 0, 0);
+			// CDiffWindow get resized right away, but not if files are equal, so...
+			// Provide some sane defaults for its size.
+			BRect r(100, 100, 500, 250);
 			CDiffWindow *ndw = new CDiffWindow(r, "Differences");
 
 			BMessage msg(msg_Add2Files);