diff --git a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/AWIPSHeaderBlockDlg.java b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/AWIPSHeaderBlockDlg.java
index dfdad3b7fd..b93ccbcb25 100644
--- a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/AWIPSHeaderBlockDlg.java
+++ b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/AWIPSHeaderBlockDlg.java
@@ -766,7 +766,14 @@ public class AWIPSHeaderBlockDlg extends CaveSWTDialog implements
 
                             AfosIdSelectionDialog dlg = new AfosIdSelectionDialog(
                                     shell, this, afosIds);
-                            dlg.setBlockOnOpen(true);
+                            dlg.setCloseCallback(new ICloseCallback() {
+
+                                @Override
+                                public void dialogClosed(Object returnValue) {
+                                    lookupAllowed = true;
+                                }
+                            });
+                            dlg.setBlockOnOpen(false);
                             dlg.open();
                             return;
                         } else if (list.size() == 1) {
diff --git a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/AfosIdSelectionDialog.java b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/AfosIdSelectionDialog.java
index eb492cb1db..af87c1563b 100644
--- a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/AfosIdSelectionDialog.java
+++ b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/AfosIdSelectionDialog.java
@@ -23,6 +23,7 @@ import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
@@ -43,6 +44,8 @@ import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Aug 28, 2009 2924       rjpeter     Initial creation.
+ * Sep 20, 1010 1196       rferrel     Scroll bar now displays and limit placed
+ *                                     on the height of the dialog.
  * </pre>
  * 
  * @author rjpeter
@@ -120,7 +123,7 @@ public class AfosIdSelectionDialog extends CaveJFACEDialog {
         label.setLayoutData(data);
 
         afosIdList = new List(top, SWT.SINGLE | SWT.BORDER | SWT.V_SCROLL);
-        data = new GridData(SWT.BEGINNING, SWT.DEFAULT, true, false);
+        data = new GridData(SWT.CENTER, SWT.FILL, false, true);
         afosIdList.setLayoutData(data);
 
         for (String id : afosIds) {
@@ -158,4 +161,13 @@ public class AfosIdSelectionDialog extends CaveJFACEDialog {
         top.layout();
         return top;
     }
+
+    @Override
+    protected Point getInitialSize() {
+        Point point = super.getInitialSize();
+        if (point.y > 500) {
+            point.y = 500;
+        }
+        return point;
+    }
 }