diff --git a/plugins/git4idea/src/git4idea/rebase/GitRebaseUnstructuredEditor.java b/plugins/git4idea/src/git4idea/rebase/GitRebaseUnstructuredEditor.java
index 76f1a0ccd026..7f63371a16ff 100644
--- a/plugins/git4idea/src/git4idea/rebase/GitRebaseUnstructuredEditor.java
+++ b/plugins/git4idea/src/git4idea/rebase/GitRebaseUnstructuredEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -67,6 +67,7 @@ public class GitRebaseUnstructuredEditor extends DialogWrapper {
     encoding = GitConfigUtil.getCommitEncoding(project, root);
     myFile = new File(path);
     myTextArea.setText(FileUtil.loadFile(myFile, encoding));
+    myTextArea.setCaretPosition(0);
     init();
   }
 
@@ -93,4 +94,9 @@ public class GitRebaseUnstructuredEditor extends DialogWrapper {
   protected String getDimensionServiceKey() {
     return getClass().getName();
   }
+
+  @Override
+  public JComponent getPreferredFocusedComponent() {
+    return myTextArea;
+  }
 }