diff --git a/assets/loldrivers-webclient.wasm b/assets/loldrivers-webclient.wasm
index 2cfa095..fc5574f 100644
Binary files a/assets/loldrivers-webclient.wasm and b/assets/loldrivers-webclient.wasm differ
diff --git a/index.html b/index.html
index 8f547d4..ddf55bf 100644
--- a/index.html
+++ b/index.html
@@ -28,7 +28,7 @@ <h1>LOLDrivers-webclient</h1>
 				<li>C:\Windows\System32\DriverStore\FileRepository</li>
 				<li>C:\WINDOWS\inf</li>
 			</ul>
-			<button id="select-folder-button">Select Folder</button>
+			<button id="select-folder-button" disabled>Loading...</button>
 			<div id="results" style="display: none">
 				<h2>Results</h2>
 				<p>Processed files: <span id=file-counter>0</span></p>
diff --git a/main.go b/main.go
index 1344aac..ca54887 100644
--- a/main.go
+++ b/main.go
@@ -45,15 +45,24 @@ func MatchHashWrapper(this js.Value, p []js.Value) interface{} {
 }
 
 func main() {
+	// Get the button from the DOM
+	jsDoc := js.Global().Get("document")
+	folderButton := jsDoc.Call("getElementById", "select-folder-button")
+
 	fmt.Println("Loading drivers")
 	if err := loldrivers.LoadDrivers(); err != nil {
 		fmt.Println(err)
+		folderButton.Set("innerHTML", "There was an error fetching the driver data, check the console")
 		return
 	}
 
-	fmt.Println("Registering lookupHash")
+	fmt.Println("Registering lookupHash function")
 	js.Global().Set("lookupHash", js.FuncOf(MatchHashWrapper))
 
+	// Enable the button if we get here
+	folderButton.Set("innerHTML", "Select folder")
+	folderButton.Set("disabled", false)
+
 	// Do not quit
 	select {}
 }