diff --git a/src/App.js b/src/App.js
index 9c39354..dd0dcdb 100644
--- a/src/App.js
+++ b/src/App.js
@@ -71,9 +71,9 @@ export default React.memo(function App() {
                             <ModePicker />
                             <KeyTypePicker />
                             <WordsPerMinute />
-                            {gameMode === 'challenge' &&
+                            {/* {gameMode === 'challenge' &&
                                 <WordListPicker />
-                            }
+                            } */}
                         </div>
                         <Legend />
                     </div>
diff --git a/src/app-modes/ChallengeMode.js b/src/app-modes/ChallengeMode.js
index 26d0ed1..ac438c7 100644
--- a/src/app-modes/ChallengeMode.js
+++ b/src/app-modes/ChallengeMode.js
@@ -38,7 +38,7 @@ export default React.memo(function ChallengeMode(props) {
         cleanup()
         resetFeeder()
 
-        //BREAKS HERE AFTER WORDLIST IS COMPLETED
+        // Show a card showing challenge completion stats and option to restart word list
         try { alert(`Time: ${document.getElementById('gameClock').innerText}`) }
         catch { return }
         return
diff --git a/src/components/ChallengeOverlay.js b/src/components/ChallengeOverlay.js
index e91fabe..684308e 100644
--- a/src/components/ChallengeOverlay.js
+++ b/src/components/ChallengeOverlay.js
@@ -1,5 +1,6 @@
 import React, { useContext } from "react"
 import { GameClockContext } from "../contexts/gameClockContext"
+import WordListPicker from "./WordListPicker"
 
 
 export default (function ChallengeOverlay() {
@@ -24,7 +25,10 @@ export default (function ChallengeOverlay() {
 
     return (
         <div id="challenge-overlay">
-            <div id="challengeReady" className="notify" onClick={startChallenge}>Click to Start Challenge!</div>
+            <div id="challengeReady" className="notify">
+                <WordListPicker />
+                <button id="startChallenge" onClick={startChallenge}>Click to Start Challenge!</button>
+            </div>
         </div>
     )
 })
\ No newline at end of file