diff --git a/HomeFiles/Lexicon.html b/HomeFiles/Lexicon.html
index 38fed02f..c55c05f9 100644
--- a/HomeFiles/Lexicon.html
+++ b/HomeFiles/Lexicon.html
@@ -11,9 +11,9 @@
             <h1><span class="logo"><span>The OpenScriptures</span><br />Hebrew Bible</span> – Lexicon</h1>
         </header>
 		<nav>
-			<form>
+			<form method="get">
 				<label for="lexID">Enter an OSHB lemma or Strong Number</label>
-				<input type="text" id="lexID" />
+				<input type="text" id="lexID" name="lexID" />
 				<input type="submit" id="submit" value="Enter" />
 				<a href="https://github.com/openscriptures/HebrewLexicon/blob/master/HomeFiles/readme.md" target="_blank">Instructions</a>
 			</form>
diff --git a/HomeFiles/Script/Lexicon.js b/HomeFiles/Script/Lexicon.js
index 82387ada..4e3f602f 100644
--- a/HomeFiles/Script/Lexicon.js
+++ b/HomeFiles/Script/Lexicon.js
@@ -15,14 +15,37 @@
 		return parts[parts.length - 1].replace(" ", "");
 	}
 	// Click handler for the input form.
+	var noPush = false; // lets you go back and forward again
 	function setID() {
 		var id = parseLemma(lexID.value);
 		if (parseInt(id) || id.length == 1) {
 			id = aug[(augments.indexOf(id) >= 0) ? id + "a" : id];
 		}
 		wordGroup.set(id);
+
+		if (!noPush) {
+			window.history.pushState({}, "", "?lexID=" + lexID.value);
+		}
+		noPush = false;
 		return false;
 	}
 	document.getElementById("submit").onclick = setID;
+	
+	function setIDFromQueryString() {
+		var queryString = window.location.search;
+		var urlParams = new URLSearchParams(queryString);
+		var lexIDFromQueryString = urlParams.get('lexID');
+
+		if (lexIDFromQueryString) {
+			lexID.value = lexIDFromQueryString;
+			setID();
+		}
+	}
+	setIDFromQueryString();
+	window.addEventListener("popstate", function() {
+		noPush = true;
+		setIDFromQueryString();
+	});
+
 	lexID.select();
 })();
\ No newline at end of file
diff --git a/HomeFiles/Script/WordGroup.js b/HomeFiles/Script/WordGroup.js
index 6596766f..3c1e7175 100644
--- a/HomeFiles/Script/WordGroup.js
+++ b/HomeFiles/Script/WordGroup.js
@@ -37,7 +37,9 @@ wordGroup = function() {
 		} else {
 			bdbControl("");
 			strongControl("");
-			lexID.value = currentID;
+			if(currentID !== undefined) {
+				lexID.value = currentID;
+			}
 		}
 	};
 /******************************************************************************