diff --git a/changelog.md b/changelog.md
index de22e8f..f4a149d 100644
--- a/changelog.md
+++ b/changelog.md
@@ -3,6 +3,7 @@
 - Fixed formatting for small negative numbers.
 - Fixed divide by zero when a 0-second tick occurs.
 - "deactivated" now also affects achievement/milestone unlocking.
+- Locked challenges cannot be entered.
 
 # v2.6.4.2 - 6/17/21
 - Fixed a bug with the endgame screen.
diff --git a/js/components.js b/js/components.js
index 02a6fe1..8ba3b75 100644
--- a/js/components.js
+++ b/js/components.js
@@ -274,7 +274,7 @@ function loadVue() {
 		props: ['layer', 'data', 'size'],
 		template: `
 		<div v-if="tmp[layer].buyables && tmp[layer].buyables[data]!== undefined && tmp[layer].buyables[data].unlocked" style="display: grid">
-			<button v-bind:class="{ buyable: true, tooltipBox: true, can: tmp[layer].buyables[data].canBuy, locked: !tmp[layer].buyables[data].canAfford, bought: player[layer].buyables[data].gte(tmp[layer].buyables[data].purchaseLimit)}"
+			<button v-bind:class="{ buyable: true, tooltipBox: true, can: tmp[layer].buyables[data].canBuy, locked: !tmp[layer].buyables[data].canBuy, bought: player[layer].buyables[data].gte(tmp[layer].buyables[data].purchaseLimit)}"
 			v-bind:style="[tmp[layer].buyables[data].canBuy ? {'background-color': tmp[layer].color} : {}, size ? {'height': size, 'width': size} : {}, tmp[layer].componentStyles.buyable, tmp[layer].buyables[data].style]"
 			v-on:click="if(!interval) buyBuyable(layer, data)" :id='"buyable-" + layer + "-" + data' @mousedown="start" @mouseleave="stop" @mouseup="stop" @touchstart="start" @touchend="stop" @touchcancel="stop">
 				<span v-if= "tmp[layer].buyables[data].title"><h2 v-html="tmp[layer].buyables[data].title"></h2><br></span>
diff --git a/js/game.js b/js/game.js
index 9ef37c6..b6d4515 100644
--- a/js/game.js
+++ b/js/game.js
@@ -245,7 +245,7 @@ function resetRow(row) {
 
 function startChallenge(layer, x) {
 	let enter = false
-	if (!player[layer].unlocked) return
+	if (!player[layer].unlocked || !tmp[layer].challenges[x].unlocked) return
 	if (player[layer].activeChallenge == x) {
 		completeChallenge(layer, x)
 		Vue.set(player[layer], "activeChallenge", null)