diff --git a/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/CommandScopedContext.java b/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/CommandScopedContext.java
index 501baf99a8..67af69c488 100644
--- a/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/CommandScopedContext.java
+++ b/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/CommandScopedContext.java
@@ -31,7 +31,7 @@ public class CommandScopedContext implements Context, UIContextListener
 {
    private final static String COMPONENT_MAP_NAME = CommandScopedContext.class.getName() + ".componentInstanceMap";
    private final static String CREATIONAL_MAP_NAME = CommandScopedContext.class.getName() + ".creationalInstanceMap";
-   static final LinkedList<UIContext> CONTEXT_STACK = new LinkedList<UIContext>();
+   private static final LinkedList<UIContext> CONTEXT_STACK = new LinkedList<UIContext>();
 
    @Override
    public Class<? extends Annotation> getScope()
@@ -86,7 +86,7 @@ private void assertActive()
       }
    }
 
-   private UIContext getCurrentContext()
+   static UIContext getCurrentContext()
    {
       return CONTEXT_STACK.peek();
    }
diff --git a/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/UIContextHandler.java b/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/UIContextHandler.java
index 108447cd5e..f010a9fc86 100644
--- a/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/UIContextHandler.java
+++ b/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/UIContextHandler.java
@@ -20,7 +20,7 @@ public class UIContextHandler implements UIContextProvider
    @Override
    public UIContext getUIContext()
    {
-      return CommandScopedContext.CONTEXT_STACK.peek();
+      return CommandScopedContext.getCurrentContext();
    }
 
 }
diff --git a/ui/tests/src/test/java/org/jboss/forge/addon/ui/scope/UIContextProviderTest.java b/ui/tests/src/test/java/org/jboss/forge/addon/ui/scope/UIContextProviderTest.java
index 615040ce04..15040478e4 100644
--- a/ui/tests/src/test/java/org/jboss/forge/addon/ui/scope/UIContextProviderTest.java
+++ b/ui/tests/src/test/java/org/jboss/forge/addon/ui/scope/UIContextProviderTest.java
@@ -65,5 +65,6 @@ public void testContextProvider() throws Exception
          Assert.assertNotNull(contextProvider.getUIContext());
          Assert.assertSame(contextProvider.getUIContext(), controller.getContext());
       }
+      Assert.assertNull(contextProvider.getUIContext());
    }
 }