diff --git a/src/redux/selectors.js b/src/redux/selectors.js
index 15525a7a..8a7a2717 100644
--- a/src/redux/selectors.js
+++ b/src/redux/selectors.js
@@ -33,11 +33,13 @@ export function getMatchingSkinHashes(state) {
 }
 
 export function getUrl(state) {
-  if (state.selectedSkinHash) {
+  const hash = getSelectedSkinHash(state);
+  const query = getSearchQuery(state);
+  if (hash) {
     // TODO: Add a human readable version
-    return `/skin/${getSelectedSkinHash(state)}/`;
-  } else {
-    return "/";
+    return `/skin/${hash}/${Utils.filenameFromHash(hash)}`;
+  } else if (query) {
+    return `/?query=${encodeURIComponent(query)}`;
   }
 }
 
diff --git a/src/redux/store.js b/src/redux/store.js
index 4c10a132..be420991 100644
--- a/src/redux/store.js
+++ b/src/redux/store.js
@@ -1,4 +1,5 @@
 import { createStore as createReduxStore } from "redux";
+import qs from "qs";
 import * as Selectors from "./selectors";
 
 const defaultState = {
@@ -22,16 +23,19 @@ function reducer(state = defaultState, action) {
         selectedSkinPosition: null
       };
     case "URL_CHANGED":
+      const params = new URLSearchParams(action.location.search);
+      const searchQuery = params != null && params.get("query");
       if (action.location.pathname.startsWith("/skin/")) {
         const segments = action.location.pathname.split("/");
         return {
           ...state,
           selectedSkinHash: segments[2],
           // TODO: This makes no sense
-          selectedSkinPosition: null
+          selectedSkinPosition: null,
+          searchQuery
         };
       }
-      return defaultState;
+      return { ...defaultState, searchQuery };
     case "SET_SEARCH_QUERY":
       return {
         ...state,
@@ -54,6 +58,7 @@ export function createStore() {
   });
   window.onpopstate = function(event) {
     const { state } = event;
+    const query = qs.parse(document.location.search);
     store.dispatch({ type: "URL_CHANGED", location: document.location });
   };
   store.dispatch({ type: "URL_CHANGED", location: document.location });