diff --git a/client/js/lounge.js b/client/js/lounge.js
index 90666f0d..888b24c7 100644
--- a/client/js/lounge.js
+++ b/client/js/lounge.js
@@ -708,7 +708,11 @@ $(function() {
 		var self = $(this);
 		var lastMessage = self.parent().next(".messages").children(".msg").first();
 		var lastMessageId = parseInt(lastMessage[0].id.replace("msg-", ""), 10);
-		self.prop("disabled", true);
+
+		self
+			.text("Loading older messages…")
+			.prop("disabled", true);
+
 		socket.emit("more", {
 			target: self.data("id"),
 			lastId: lastMessageId
diff --git a/client/js/socket-events/more.js b/client/js/socket-events/more.js
index d73105cb..b8029934 100644
--- a/client/js/socket-events/more.js
+++ b/client/js/socket-events/more.js
@@ -58,5 +58,7 @@ socket.on("more", function(data) {
 		lastDate = msgDate;
 	});
 
-	scrollable.find(".show-more-button").prop("disabled", false);
+	scrollable.find(".show-more-button")
+		.text("Show older messages")
+		.prop("disabled", false);
 });
diff --git a/client/views/chat.tpl b/client/views/chat.tpl
index 55924b6f..35ebce8c 100644
--- a/client/views/chat.tpl
+++ b/client/views/chat.tpl
@@ -13,9 +13,7 @@
 	</div>
 	<div class="chat">
 		<div class="show-more {{#equal messages.length 100}}show{{/equal}}">
-			<button class="show-more-button" data-id="{{id}}">
-				Show older messages
-			</button>
+			<button class="show-more-button" data-id="{{id}}">Show older messages</button>
 		</div>
 		<div class="messages"></div>
 	</div>