diff --git a/kie-wb-common-screens/kie-wb-common-data-modeller/kie-wb-common-data-modeller-client/src/main/java/org/kie/workbench/common/screens/datamodeller/client/widgets/refactoring/ShowUsagesPopup.java b/kie-wb-common-screens/kie-wb-common-data-modeller/kie-wb-common-data-modeller-client/src/main/java/org/kie/workbench/common/screens/datamodeller/client/widgets/refactoring/ShowUsagesPopup.java
index b66681c93ef..aee57889b33 100644
--- a/kie-wb-common-screens/kie-wb-common-data-modeller/kie-wb-common-data-modeller-client/src/main/java/org/kie/workbench/common/screens/datamodeller/client/widgets/refactoring/ShowUsagesPopup.java
+++ b/kie-wb-common-screens/kie-wb-common-data-modeller/kie-wb-common-data-modeller-client/src/main/java/org/kie/workbench/common/screens/datamodeller/client/widgets/refactoring/ShowUsagesPopup.java
@@ -21,6 +21,7 @@
 
 import com.google.gwt.cell.client.Cell;
 import com.google.gwt.core.client.GWT;
+import com.google.gwt.core.client.Scheduler;
 import com.google.gwt.dom.client.Style;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
@@ -129,7 +130,11 @@ protected ShowUsagesPopup( final String title,
         addShownHandler( new ModalShownHandler() {
             @Override
             public void onShown( ModalShownEvent shownEvent ) {
-                loadTable();
+                Scheduler.get().scheduleDeferred( new com.google.gwt.user.client.Command() {
+                    @Override public void execute() {
+                        loadTable();
+                    }
+                } );
             }
         } );
     }
@@ -305,6 +310,7 @@ public void render( Cell.Context context,
 
     private void loadTable() {
         if ( usedByFiles != null && !usedByFiles.isEmpty() ) {
+            usedByFilesProvider.getList().clear();
             usedByFilesProvider.getList().addAll( createUsedByRows( usedByFiles ) );
         }
     }