diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java
index 2c5d12353a7..c1fb8a7efba 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java
@@ -39,6 +39,7 @@
  * Rupen Mardirossian (IBM)		 - [208435] added constructor to nested RenameRunnable class to take in names that are previously used as a parameter for multiple renaming instances
  * David McKnight   (IBM)        - [209660] need to check if remote encoding has changed before using cached file 
  * Xuan Chen        (IBM)        - [160775] [api] [breaking] [nl] rename (at least within a zip) blocks UI thread
+ * Xuan Chen        (IBM)        - [209899] system view did not refresh properly if rename multiple folders in table view.
  ********************************************************************************/
 
 package org.eclipse.rse.internal.files.ui.view;
@@ -2881,7 +2882,9 @@ public class SystemViewRemoteFileAdapter
 			RemoteFile oldFile = (RemoteFile)oldElement;
 			RemoteFile newFile = (RemoteFile)newElement;
 			
-			if ((oldFile != newFile) && (oldFile.isFile()) && (newFile.isFile())) {
+			if (       (oldFile != newFile) 
+					&& (       (oldFile.isFile() && newFile.isFile()) 
+							|| (oldFile.isDirectory() && newFile.isDirectory()) )) {
 				oldFile.getHostFile().renameTo(newFile.getAbsolutePath());
 			}