diff --git a/src/main/java/org/gcube/portlets/user/databasesmanager/client/panels/GxtBorderLayoutPanel.java b/src/main/java/org/gcube/portlets/user/databasesmanager/client/panels/GxtBorderLayoutPanel.java
index a76015d..d4cf50f 100644
--- a/src/main/java/org/gcube/portlets/user/databasesmanager/client/panels/GxtBorderLayoutPanel.java
+++ b/src/main/java/org/gcube/portlets/user/databasesmanager/client/panels/GxtBorderLayoutPanel.java
@@ -1077,8 +1077,14 @@ public class GxtBorderLayoutPanel extends ContentPanel {
 			public void componentSelected(ButtonEvent ce) {
 				// TODO Auto-generated method stub
 				
-				//fire event
-				eventBus.fireEvent(new SelectedTableEvent());
+				if (selectedTable != null){
+				
+					//fire event
+					eventBus.fireEvent(new SelectedTableEvent());
+					
+				}
+				
+				
 
 //				Listener<MessageBoxEvent> l = new Listener<MessageBoxEvent>() {
 //