diff --git a/jstrr.js b/jstrr.js
index f5e342e..1b8da9a 100644
--- a/jstrr.js
+++ b/jstrr.js
@@ -399,7 +399,7 @@
 		let td = document.createElement(i==0?"th":"td");
 		td.textContent = list[i][j];
 		tr.appendChild(td);
-		if (j == teamcol) {
+		if (j == teamcol) {		// Add inTeam ranking hook
 		    let tm = list[i][j];
 		    tr.classList.add(tm);
 		    td.addEventListener("click", filterSameTeam);
@@ -564,6 +564,7 @@
 		if (div) {
 		    div.remove(); div = null;
 		}
+		_entryFocus();
 	    }, false);
 	}
 	let text = textlist[nArea].file;
@@ -571,9 +572,8 @@
 	let request = {ranking: text};
 	if (mode) request["mode"] = mode;
 	sendJSONtoServer(request);
-	div.addEventListener("click", ()=>{history.back();});
+	div.addEventListener("click", ()=>{history.back();}, false);
 	div.addEventListener("keydown", ()=>{history.back();}, false);
-	// div.querySelector("button").focus();
     }
     function resetState() {
 	mystate.start = mystate.miss = mystate.finish = 0;