diff --git a/indra/newview/llnearbychatcontrol.cpp b/indra/newview/llnearbychatcontrol.cpp
index cf79b0ca32..8f0af8031f 100644
--- a/indra/newview/llnearbychatcontrol.cpp
+++ b/indra/newview/llnearbychatcontrol.cpp
@@ -112,6 +112,10 @@ LLNearbyChatControl::LLNearbyChatControl(const LLNearbyChatControl::Params& p) :
 	setIgnoreTab( TRUE );
 	setReplaceNewlinesWithSpaces( FALSE );
 	setPassDelete( TRUE );
+	setFont(LLViewerChat::getChatFont());
+
+	// Register for font change notifications
+	LLViewerChat::setFontChangedCallback(boost::bind(&LLNearbyChatControl::setFont, this, _1));
 }
 
 LLNearbyChatControl::~LLNearbyChatControl()