diff --git a/files/assets/js/submit.js b/files/assets/js/submit.js
index 18326a03d..cd6aad461 100644
--- a/files/assets/js/submit.js
+++ b/files/assets/js/submit.js
@@ -1,6 +1,6 @@
 function hide_image() {
 	x=document.getElementById('image-upload-block');
-	url=document.getElementById('post-URL').value;
+	url=document.getElementById('post-url').value;
 	if (url.length>=1){
 		x.classList.add('d-none');
 	}
@@ -48,16 +48,16 @@ document.getElementById('file-upload').addEventListener('change', function(){
 })
 
 function savetext() {
-	let post_title = document.getElementById('post-title').value
-	let post_text = document.getElementById('post-text').value
-	localStorage.setItem("post_title", post_title)
-	localStorage.setItem("post_text", post_text)
+	localStorage.setItem("post_title", document.getElementById('post-title').value)
+	localStorage.setItem("post_text", document.getElementById('post-text').value)
+	localStorage.setItem("post_url", document.getElementById('post-url').value)
+	localStorage.setItem("sub", document.getElementById('sub').value)
 }
 
 
 function autoSuggestTitle()	{
 
-    var urlField = document.getElementById("post-URL");
+    var urlField = document.getElementById("post-url");
 
     var titleField = document.getElementById("post-title");
 
diff --git a/files/routes/posts.py b/files/routes/posts.py
index e67ec056b..dc14f8d03 100644
--- a/files/routes/posts.py
+++ b/files/routes/posts.py
@@ -862,7 +862,7 @@ def submit_post(v, sub=None):
 		return render_template("submit.html", SUBS=SUBS, v=v, error=error, title=title, url=url, body=body, ghost=submit_ghost(v,g.db)), 400
 
 
-	sub = request.values.get("sub")
+	sub = request.values.get("sub").replace('/s/','')
 
 	if sub and sub != 'none':
 		sub = g.db.query(Sub.name).filter_by(name=sub.strip().lower()).one_or_none()
diff --git a/files/templates/submit.html b/files/templates/submit.html
index 2f34e2b6b..e3f50cda5 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -80,22 +80,20 @@
 												<input autocomplete="off" type="hidden" name="formkey" value="{{v.formkey}}">
 
 												{% if SITE_NAME != 'Drama' or sub %}
+
 													<label class='mt-4' for="title">Sub</label>
 
 													<div class="input-group mb2">
-														<select autocomplete="off" id='sub' class="form-control" form="submitform" name="sub">
+														<input list="subs" autocomplete="off" id='sub' class="form-control" form="submitform" name="sub" oninput="savetext()">
+														<datalist id="subs">
 															{% if SITE_NAME != 'Ruqqus' %}
-																<option value="none" selected>
-																	None
-																</option>
+																<option value="/s/none" selected></option>
 															{% endif %}
 
 															{% for s in SUBS %}
-																<option value="{{s}}" {% if sub and sub.name == s %}selected{% endif %}>
-																	/s/{{s}}
-																</option>
+																<option value="/s/{{s}}" {% if sub and sub.name == s %}selected{% endif %}></option>
 															{% endfor %}
-														</select>
+														</datalist>
 													</div>
 												{% endif %}
 						
@@ -110,7 +108,7 @@
 
 												<div id="urlblock">
 														<label for="URL" class="mt-3">URL</label>
-														<input autocomplete="off" class="form-control" id="post-URL" aria-describedby="URLHelp" name="url" placeholder="Optional if you have text." value="{{request.values.get('url','')}}" required oninput="checkForRequired();hide_image();autoSuggestTitle()">
+														<input autocomplete="off" class="form-control" id="post-url" aria-describedby="URLHelp" name="url" placeholder="Optional if you have text." value="{{request.values.get('url','')}}" required oninput="checkForRequired();hide_image();autoSuggestTitle();savetext()">
 														<small class="form-text text-muted">To post an image, use a direct image link such as i.imgur.com</small>
 												</div>
 												<div id="image-upload-block">
@@ -225,16 +223,16 @@
 		{% endblock %}
 
 		<script>
-			let fetched_title = localStorage.getItem("post_title")
-			document.getElementById('post-title').value = fetched_title
-			let fetched_text = localStorage.getItem("post_text")
-			document.getElementById('post-text').value = fetched_text
+			document.getElementById('post-title').value = localStorage.getItem("post_title")
+			document.getElementById('post-text').value = localStorage.getItem("post_text")
+			document.getElementById('post-url').value = localStorage.getItem("post_url")
+			document.getElementById('sub').value = localStorage.getItem("sub")
 
 			function checkForRequired() {
 
 				var title = document.getElementById("post-title");
 
-				var url = document.getElementById("post-URL");
+				var url = document.getElementById("post-url");
 
 				var text = document.getElementById("post-text");
 
@@ -271,7 +269,7 @@
 
 		<script src="/static/assets/js/marked.js?a=242"></script>
 		<script src="/static/assets/js/formatting.js?a=240"></script>
-		<script src="/static/assets/js/submit.js?a=244"></script>
+		<script src="/static/assets/js/submit.js?a=246"></script>
 		{% include "emoji_modal.html" %}
 		{% include "gif_modal.html" %}