2 files changed, 10 insertions, 4 deletions
diff --git a/webapps/swat/source/class/swat/module/ldbbrowse/Fsm.js b/webapps/swat/source/class/swat/module/ldbbrowse/Fsm.js
index eb31fa9c8a..02aada9ebf 100644
--- a/webapps/swat/source/class/swat/module/ldbbrowse/Fsm.js
+++ b/webapps/swat/source/class/swat/module/ldbbrowse/Fsm.js
@@ -61,7 +61,7 @@ qx.Proto.buildFsm = function(module)
             {
               // Yup.  Re-open the database
               var dbName = fsm.getObject("dbName");
-              dbName.dispatchEvent(new qx.event.type.Event("changeSelection"),
+              dbName.dispatchEvent(new qx.event.type.Event("changeSelected"),
                                    true);
             }
             else
@@ -104,8 +104,14 @@ qx.Proto.buildFsm = function(module)
           "changeSelection":
           {
             "tree" :
-              "Transition_Idle_to_AwaitRpcResult_via_tree_selection_changed",
+              "Transition_Idle_to_AwaitRpcResult_via_tree_selection_changed"
 
+          },
+
+	  // If another database is selected, try to open it and refresh
+          // the tree
+          "changeSelected":
+          {
             "dbName":
               "Transition_Idle_to_AwaitRpcResult_via_db_changed"
           }
diff --git a/webapps/swat/source/class/swat/module/ldbbrowse/Gui.js b/webapps/swat/source/class/swat/module/ldbbrowse/Gui.js
index d341563164..9b1372a044 100644
--- a/webapps/swat/source/class/swat/module/ldbbrowse/Gui.js
+++ b/webapps/swat/source/class/swat/module/ldbbrowse/Gui.js
@@ -52,9 +52,9 @@ qx.Proto.buildGui = function(module)
   // Add our global database name (the only option, for now)
   var item = new qx.ui.form.ListItem(module.dbFile);
   o.add(item);
-  
+
   // We want to be notified if the selection changes
-  o.addEventListener("changeSelection", fsm.eventListener, fsm);
+  o.addEventListener("changeSelected", fsm.eventListener, fsm);
 
   // Save the database name object so we can react to changes
   fsm.addObject("dbName", o);