diff --git a/static/js/ui.js b/static/js/ui.js
index 456a15b4cb..84046e373c 100644
--- a/static/js/ui.js
+++ b/static/js/ui.js
@@ -149,6 +149,7 @@ exports.maybe_show_deprecation_notice = function (key) {
     if (shown_deprecation_notices.indexOf(key) === -1) {
         $('#deprecation-notice-modal').modal('show');
         $('#deprecation-notice-message').text(message);
+        $('#close-deprecation-notice').focus();
         shown_deprecation_notices.push(key);
         if (localstorage.supported()) {
             localStorage.setItem('shown_deprecation_notices', JSON.stringify(shown_deprecation_notices));
diff --git a/templates/zerver/app/deprecation_notice.html b/templates/zerver/app/deprecation_notice.html
index 5f1c2dfe9d..5a34045e98 100644
--- a/templates/zerver/app/deprecation_notice.html
+++ b/templates/zerver/app/deprecation_notice.html
@@ -11,6 +11,6 @@
     </div>
 
     <div class="modal-footer">
-        <button type="button" class="button rounded" data-dismiss="modal">{{ _("Got it") }}</button>
+        <button type="button" class="button rounded" id="close-deprecation-notice" data-dismiss="modal">{{ _("Got it") }}</button>
     </div>
 </div>