diff --git a/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.ide/plugin.xml b/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.ide/plugin.xml
index 6500e62..38c75a9 100644
--- a/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.ide/plugin.xml
+++ b/org.eclipse.amp.axf/plugins/org.eclipse.amp.axf.ide/plugin.xml
@@ -561,6 +561,9 @@
                    <equals
                          value="STOPPED">
                    </equals>
+                   <equals
+                         value="CLOSING">
+                   </equals>
                 </or>
              </with>
           </enabledWhen>
diff --git a/org.eclipse.amp.axf/tests/org.eclipse.amp.axf.ide.test/src/org/eclipse/amp/axf/ide/handlers/CloseHandlerTest.java b/org.eclipse.amp.axf/tests/org.eclipse.amp.axf.ide.test/src/org/eclipse/amp/axf/ide/handlers/CloseHandlerTest.java
index f877b15..fb10369 100644
--- a/org.eclipse.amp.axf/tests/org.eclipse.amp.axf.ide.test/src/org/eclipse/amp/axf/ide/handlers/CloseHandlerTest.java
+++ b/org.eclipse.amp.axf/tests/org.eclipse.amp.axf.ide.test/src/org/eclipse/amp/axf/ide/handlers/CloseHandlerTest.java
@@ -4,9 +4,9 @@
 
 /**
  * Closing should be enabled when {@link EngineStateService#IDLE},
- * {@link EngineStateService#RUNNING}, {@link EngineStateService#PAUSED} and
- * {@link EngineStateService#STOPPED}. So basically at all times, except when
- * already closing.
+ * {@link EngineStateService#RUNNING}, {@link EngineStateService#PAUSED},
+ * {@link EngineStateService#STOPPED} and {@link EngineStateService#CLOSING}. So
+ * basically at all times, except when already closing.
  * 
  * @author jonas.ruettimann
  */
@@ -19,12 +19,12 @@
 
 	@Override
 	protected TestRunningState[] getEnabledStates() {
-		return new TestRunningState[] { STATE_IDLE, STATE_PAUSED, STATE_RUNNING, STATE_STOPPED };
+		return new TestRunningState[] { STATE_IDLE, STATE_PAUSED, STATE_RUNNING, STATE_STOPPED, STATE_ENDING };
 	}
 
 	@Override
 	protected TestRunningState[] getDisabledStates() {
-		return new TestRunningState[] { STATE_ENDING };
+		return new TestRunningState[] {};
 	}
 
 }