diff --git a/uis/src/com/biglybt/ui/swt/views/FilesView.java b/uis/src/com/biglybt/ui/swt/views/FilesView.java
index 92d02eac219..ef21cce3257 100644
--- a/uis/src/com/biglybt/ui/swt/views/FilesView.java
+++ b/uis/src/com/biglybt/ui/swt/views/FilesView.java
@@ -154,6 +154,12 @@ private static TableColumnCore[] getBasicItems(String tableID )
   public static final String MSGID_PREFIX = "FilesView";
 
   private String view_sub_id;
+
+  private String
+  getViewKey()
+  {
+  	return( view_sub_id != null ? MSGID_PREFIX + "." + view_sub_id : MSGID_PREFIX );
+  }
   
   private DownloadManager[] managers = new DownloadManager[0];
 
@@ -529,7 +535,7 @@ public void taggableSync(Tag tag) {
 				
 				if ( map != null ){
 					
-					Map<String,Object> view = map.get( "FilesView" );
+					Map<String,Object> view = map.get( getViewKey() );
 					
 					if ( view != null ){
 						
@@ -1049,13 +1055,13 @@ public void selected(TableRowCore[] rows) {
 					map = new HashMap<>( map );
 				}
 				
-				Map<String,Object> view = map.get( "FilesView" );
+				Map<String,Object> view = map.get( getViewKey() );
 				
 				if ( view == null ){
 					
 					view = new HashMap<>();
 					
-					map.put( "FilesView", view );
+					map.put( getViewKey(), view );
 				}
 				
 				MapUtils.setMapString( view, "filter", filter);