diff --git a/js/apps/system/aardvark/frontend/js/views/dbSelectionView.js b/js/apps/system/aardvark/frontend/js/views/dbSelectionView.js
index e51a06cd8c..7b71f845de 100644
--- a/js/apps/system/aardvark/frontend/js/views/dbSelectionView.js
+++ b/js/apps/system/aardvark/frontend/js/views/dbSelectionView.js
@@ -18,8 +18,7 @@
     },
 
     changeDatabase: function(e) {
-//        var changeTo = $(".dbSelectionLink > option:selected").attr("id");
-        var changeTo = $(".dbSelectionLink").attr("id");
+      var changeTo = $(e.currentTarget).closest(".dbSelectionLink.tab").attr("id");
       var url = this.collection.createDatabaseURL(changeTo);
       window.location.replace(url);
     },