diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/adt/design/DesignViewGraphicalViewer.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/adt/design/DesignViewGraphicalViewer.java
index 2c54dfd..46a469a 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/adt/design/DesignViewGraphicalViewer.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/adt/design/DesignViewGraphicalViewer.java
@@ -60,7 +60,8 @@
     {
       if (selectedObject instanceof IStructure)
       {
-        if ((getInput() instanceof IModel) && (event.getSource() instanceof ADTContentOutlinePage))
+        if (((getInput() instanceof IModel) && (event.getSource() instanceof ADTContentOutlinePage)) ||
+            (!(getInput() instanceof IModel)))
         {
           ((RootContentEditPart) getContents()).setInput(selectedObject);
         }
@@ -68,7 +69,8 @@
       else if (selectedObject instanceof IField)
       {
         IField field = (IField)selectedObject;
-        if (field.isGlobal() && (getInput() instanceof IModel) && (event.getSource() instanceof ADTContentOutlinePage))
+        if ( (field.isGlobal() && (getInput() instanceof IModel) && (event.getSource() instanceof ADTContentOutlinePage)) ||
+            ( (field.isGlobal() && !(getInput() instanceof IModel))))
         {  
           ((RootContentEditPart) getContents()).setInput(selectedObject);
         }