diff --git a/rse/plugins/org.eclipse.rse.shells.ui/plugin.xml b/rse/plugins/org.eclipse.rse.shells.ui/plugin.xml
index e936038886c..1dccf0754dd 100644
--- a/rse/plugins/org.eclipse.rse.shells.ui/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.shells.ui/plugin.xml
@@ -17,6 +17,7 @@ Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
 Martin Oberhuber (Wind River) - [186748] Move ISubSystemConfigurationAdapter from UI/rse.core.subsystems.util
 Anna Dushistova  (MontaVista) - [226550] [api] Launch Shell and Launch Terminal actions should be contributed declaratively
 Anna Dushistova  (MontaVista) - [234274][api] Launch Shell / Terminal commands menu placement and category
+Anna Dushistova  (MontaVista) - [235934] Launch Shell/Terminal commands enabled when selection is empty
 -->
 <?eclipse version="3.0"?>
 <plugin>
@@ -145,6 +146,8 @@ Anna Dushistova  (MontaVista) - [234274][api] Launch Shell / Terminal commands m
                  label="%Launch_Shell"
                  tooltip="%Launch_Shell_Tooltip">
              <visibleWhen>
+               <with variable="selection">
+			     <count value="1" />
                <iterate>
                <and>
                   <test
@@ -161,6 +164,7 @@ Anna Dushistova  (MontaVista) - [234274][api] Launch Shell / Terminal commands m
                   </test>
                   </and>
                  </iterate> 
+                 </with> 
                  </visibleWhen>
                </command> 
              </menuContribution>  
diff --git a/rse/plugins/org.eclipse.rse.terminals.ui/plugin.xml b/rse/plugins/org.eclipse.rse.terminals.ui/plugin.xml
index 01600bcd49f..40f2d1d2090 100644
--- a/rse/plugins/org.eclipse.rse.terminals.ui/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.terminals.ui/plugin.xml
@@ -16,6 +16,7 @@ Martin Oberhuber (Wind River) - [180519] declaratively register adapter factorie
 Yu-Fen Kuo (MontaVista) - [170910] Integrate Terminal with RSE
 Anna Dushistova  (MontaVista) - [227535] [rseterminal][api] terminals.ui should not depend on files.core
 Anna Dushistova  (MontaVista) - [234274][api] Launch Shell / Terminal commands menu placement and category
+Anna Dushistova  (MontaVista) - [235934] Launch Shell/Terminal commands enabled when selection is empty
 -->
 <?eclipse version="3.2"?>
 <plugin>
@@ -58,6 +59,8 @@ Anna Dushistova  (MontaVista) - [234274][api] Launch Shell / Terminal commands m
                  label="%Launch_Terminal_Label"
                  tooltip="%Launch_Terminal_Tooltip">
              <visibleWhen>
+               <with variable="selection">
+			     <count value="1" />
                <iterate>
                <or>
                <and>
@@ -78,7 +81,8 @@ Anna Dushistova  (MontaVista) - [234274][api] Launch Shell / Terminal commands m
                         value="org.eclipse.rse.subsystems.terminals.core.ITerminalServiceSubSystem">
                   </instanceof>
                </or>
-                 </iterate> 
+                 </iterate>
+                 </with> 
                  </visibleWhen>
                </command> 
              </menuContribution>