diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/AbstractDebugView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/AbstractDebugView.java
index 29c6d62..734d6bd 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/AbstractDebugView.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/AbstractDebugView.java
@@ -7,6 +7,7 @@
  * 
  *  Contributors:
  *     IBM Corporation - initial API and implementation
+ *     
  *******************************************************************************/
 package org.eclipse.debug.ui;
 
@@ -284,13 +285,7 @@
 		 * @see IPage#setFocus()
 		 */
 		public void setFocus() {
-			Viewer viewer= getViewer();
-			if (viewer != null) {
-				Control c = viewer.getControl();
-				if (!c.isFocusControl()) {
-					c.setFocus();
-				}
-			}
+			internalSetFocus();
 		}
 
 }
@@ -348,6 +343,7 @@
 			showMessage(fEarlyMessage);
 			fEarlyMessage= null;
 		}
+		internalSetFocus();
 	}	
 	
 	/**
@@ -1002,6 +998,16 @@
 		}
 		return new HashMap();
 	}
+
+	private void internalSetFocus() {
+		Viewer viewer= getViewer();
+		if (viewer != null) {
+			Control c = viewer.getControl();
+			if (!c.isFocusControl()) {
+				c.setFocus();
+			}
+		}
+	}
 }