diff --git a/plugins/com.minres.scviewer.ui/plugin.xml b/plugins/com.minres.scviewer.ui/plugin.xml
index 4e7ff60..46310b0 100644
--- a/plugins/com.minres.scviewer.ui/plugin.xml
+++ b/plugins/com.minres.scviewer.ui/plugin.xml
@@ -316,30 +316,25 @@
             id="com.minres.scviewer.ui.oneWaveSeleted">
             <with
                   variable="selection">
-               <and>
-                  <count
-                        value="1">
-                  </count>
- 				<iterate
-           operator="or">
-       				<instanceof value="com.minres.scviewer.database.IWaveform"/>
-    			</iterate>      
-            </and>
+               <iterate
+                     ifEmpty="false"
+                     operator="or">
+                  <instanceof
+                        value="com.minres.scviewer.database.ui.TrackEntry">
+                  </instanceof>
+               </iterate>
             </with>
       </definition>
       <definition
             id="com.minres.scviewer.ui.oneTxSeleted">
             <with
                   variable="selection">
-               <and>
-                  <count
-                        value="1">
-                  </count>
- 				<iterate
-           operator="or">
-       				<instanceof value="com.minres.scviewer.database.tx.ITx"/>
-    			</iterate>      
-            </and>
+               <iterate
+                     operator="or">
+                  <instanceof
+                        value="com.minres.scviewer.database.tx.ITx">
+                  </instanceof>
+               </iterate>
             </with>
       </definition>
       <definition
diff --git a/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorPart.java b/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorPart.java
index ae61a6c..4456a6a 100644
--- a/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorPart.java
+++ b/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorPart.java
@@ -333,6 +333,10 @@ public class TxEditorPart extends EditorPart implements ITabbedPropertySheetPage
 			addStreamToList(stream);
 	}
 
+	public void removeStreamFromList(TrackEntry entry){
+		waveformView.getStreamList().remove(entry);
+	}
+
 	public void removeStreamFromList(IWaveform waveform){
 		if(getEditorInput() instanceof TxEditorInput && ((TxEditorInput) getEditorInput()).getStreamNames().contains(waveform.getFullName())){
 			((TxEditorInput) getEditorInput()).getStreamNames().remove(waveform.getFullName());
diff --git a/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/handler/RemoveHandler.java b/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/handler/RemoveHandler.java
index e4b32d7..89d9777 100644
--- a/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/handler/RemoveHandler.java
+++ b/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/handler/RemoveHandler.java
@@ -18,7 +18,7 @@ import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.handlers.HandlerUtil;
 
-import com.minres.scviewer.database.IWaveform;
+import com.minres.scviewer.database.ui.TrackEntry;
 import com.minres.scviewer.ui.TxEditorPart;
 
 public class RemoveHandler extends AbstractHandler {
@@ -29,8 +29,12 @@ public class RemoveHandler extends AbstractHandler {
 		if(editor instanceof TxEditorPart){
 			TxEditorPart editorPart = (TxEditorPart) editor;
 			ISelection selection =editorPart.getSelection();
-			if(selection instanceof StructuredSelection && ((StructuredSelection)selection).getFirstElement() instanceof IWaveform){
-				editorPart.removeStreamFromList((IWaveform) ((StructuredSelection)selection).getFirstElement());
+			if(selection instanceof StructuredSelection) {
+				for(Object elem:((StructuredSelection) selection).toList()) {
+					if(elem instanceof TrackEntry){
+						editorPart.removeStreamFromList((TrackEntry) elem);
+					}
+				}
 				editorPart.setSelection(new StructuredSelection());
 			}
 		}