diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemDNDTransferRunnable.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemDNDTransferRunnable.java
index 17351906a28..6041d6f1fff 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemDNDTransferRunnable.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemDNDTransferRunnable.java
@@ -45,6 +45,8 @@ import org.eclipse.rse.ui.GenericMessages;
 import org.eclipse.rse.ui.ISystemMessages;
 import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.messages.SystemMessageDialog;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.progress.UIJob;
 
 
@@ -674,10 +676,26 @@ public class SystemDNDTransferRunnable extends Job
 
 	private void showErrorMessage(SystemMessage errorMessage)
 	{
-		SystemMessageDialog dlg = new SystemMessageDialog(SystemMessageDialog.getDefaultShell(), errorMessage);
-		dlg.open();
+		Display.getDefault().asyncExec(new ShowErrorRunnable(errorMessage));
 	}
 
+	public class ShowErrorRunnable implements Runnable
+	{
+		SystemMessage _errorMessage;
+		public ShowErrorRunnable(SystemMessage errorMessage)
+		{
+			_errorMessage = errorMessage;
+		}
+		
+		public void run()
+		{
+			Shell shell = SystemBasePlugin.getActiveWorkbenchShell();
+			SystemMessageDialog dlg = new SystemMessageDialog(shell, _errorMessage);
+			dlg.open();
+		}
+		
+	}
+	
 	public boolean dropOkay()
 	{
 		return _ok;
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/monitor/MonitorViewWorkbook.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/monitor/MonitorViewWorkbook.java
index c9c45c8e58e..504d04d0286 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/monitor/MonitorViewWorkbook.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/monitor/MonitorViewWorkbook.java
@@ -58,7 +58,7 @@ public class MonitorViewWorkbook extends Composite
 			for (int i = 0; i < _folder.getItemCount(); i++)
 			{
 				CTabItem item = _folder.getItem(i);
-				//if (!item.isDisposed())
+				if (!item.isDisposed())
 				{
 					MonitorViewPage page = (MonitorViewPage) item.getData();
 					page.dispose();