Bug 96866 Sorting Flat layout fails with change sets enabled
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/StructuredViewerAdvisor.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/StructuredViewerAdvisor.java
index 2ddea7a..e7c6af9 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/StructuredViewerAdvisor.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/StructuredViewerAdvisor.java
@@ -344,7 +344,13 @@
                             viewer.getControl().getDisplay().syncExec(new Runnable() {
                                 public void run() {
         	                        if (viewer != null && !viewer.getControl().isDisposed()) {
-        	                            viewer.setSorter(modelProvider.getViewerSorter());
+        	                            ViewerSorter newSorter = modelProvider.getViewerSorter();
+                                        ViewerSorter oldSorter = viewer.getSorter();
+                                        if (newSorter == oldSorter) {
+                                            viewer.refresh();
+                                        } else {
+                                            viewer.setSorter(newSorter);
+                                        }
         	                        }
                                 }
                             });