diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php
index bff2640994..788dfc1dc7 100644
--- a/src/__celerity_resource_map__.php
+++ b/src/__celerity_resource_map__.php
@@ -891,7 +891,7 @@ celerity_register_resource_map(array(
   ),
   'javelin-behavior-phabricator-object-selector' =>
   array(
-    'uri' => '/res/6788bf1e/rsrc/js/application/core/behavior-object-selector.js',
+    'uri' => '/res/0c4b0d82/rsrc/js/application/core/behavior-object-selector.js',
     'type' => 'js',
     'requires' =>
     array(
@@ -2127,7 +2127,7 @@ celerity_register_resource_map(array(
       'uri' => '/res/pkg/18be02e0/differential.pkg.css',
       'type' => 'css',
     ),
-    '79ad666a' =>
+    '4d8b2d16' =>
     array(
       'name' => 'differential.pkg.js',
       'symbols' =>
@@ -2150,7 +2150,7 @@ celerity_register_resource_map(array(
         15 => 'javelin-behavior-differential-dropdown-menus',
         16 => 'javelin-behavior-buoyant',
       ),
-      'uri' => '/res/pkg/79ad666a/differential.pkg.js',
+      'uri' => '/res/pkg/4d8b2d16/differential.pkg.js',
       'type' => 'js',
     ),
     '4ccda8a6' =>
@@ -2240,7 +2240,7 @@ celerity_register_resource_map(array(
     'aphront-typeahead-control-css' => '803864a4',
     'differential-changeset-view-css' => '18be02e0',
     'differential-core-view-css' => '18be02e0',
-    'differential-inline-comment-editor' => '79ad666a',
+    'differential-inline-comment-editor' => '4d8b2d16',
     'differential-local-commits-view-css' => '18be02e0',
     'differential-revision-add-comment-css' => '18be02e0',
     'differential-revision-comment-css' => '18be02e0',
@@ -2251,27 +2251,27 @@ celerity_register_resource_map(array(
     'diffusion-commit-view-css' => '4ccda8a6',
     'javelin-behavior' => '4fbae2af',
     'javelin-behavior-aphront-basic-tokenizer' => '2af849fb',
-    'javelin-behavior-aphront-drag-and-drop' => '79ad666a',
-    'javelin-behavior-aphront-drag-and-drop-textarea' => '79ad666a',
+    'javelin-behavior-aphront-drag-and-drop' => '4d8b2d16',
+    'javelin-behavior-aphront-drag-and-drop-textarea' => '4d8b2d16',
     'javelin-behavior-aphront-form-disable-on-submit' => '21d01ed8',
-    'javelin-behavior-buoyant' => '79ad666a',
-    'javelin-behavior-differential-accept-with-errors' => '79ad666a',
-    'javelin-behavior-differential-add-reviewers-and-ccs' => '79ad666a',
-    'javelin-behavior-differential-comment-jump' => '79ad666a',
-    'javelin-behavior-differential-diff-radios' => '79ad666a',
-    'javelin-behavior-differential-dropdown-menus' => '79ad666a',
-    'javelin-behavior-differential-edit-inline-comments' => '79ad666a',
-    'javelin-behavior-differential-feedback-preview' => '79ad666a',
-    'javelin-behavior-differential-keyboard-navigation' => '79ad666a',
-    'javelin-behavior-differential-populate' => '79ad666a',
-    'javelin-behavior-differential-show-more' => '79ad666a',
+    'javelin-behavior-buoyant' => '4d8b2d16',
+    'javelin-behavior-differential-accept-with-errors' => '4d8b2d16',
+    'javelin-behavior-differential-add-reviewers-and-ccs' => '4d8b2d16',
+    'javelin-behavior-differential-comment-jump' => '4d8b2d16',
+    'javelin-behavior-differential-diff-radios' => '4d8b2d16',
+    'javelin-behavior-differential-dropdown-menus' => '4d8b2d16',
+    'javelin-behavior-differential-edit-inline-comments' => '4d8b2d16',
+    'javelin-behavior-differential-feedback-preview' => '4d8b2d16',
+    'javelin-behavior-differential-keyboard-navigation' => '4d8b2d16',
+    'javelin-behavior-differential-populate' => '4d8b2d16',
+    'javelin-behavior-differential-show-more' => '4d8b2d16',
     'javelin-behavior-maniphest-batch-selector' => '86fc0b0c',
     'javelin-behavior-maniphest-transaction-controls' => '86fc0b0c',
     'javelin-behavior-maniphest-transaction-expand' => '86fc0b0c',
     'javelin-behavior-maniphest-transaction-preview' => '86fc0b0c',
     'javelin-behavior-phabricator-autofocus' => '21d01ed8',
     'javelin-behavior-phabricator-keyboard-shortcuts' => '21d01ed8',
-    'javelin-behavior-phabricator-object-selector' => '79ad666a',
+    'javelin-behavior-phabricator-object-selector' => '4d8b2d16',
     'javelin-behavior-phabricator-watch-anchor' => '21d01ed8',
     'javelin-behavior-refresh-csrf' => '21d01ed8',
     'javelin-behavior-workflow' => '21d01ed8',
@@ -2299,7 +2299,7 @@ celerity_register_resource_map(array(
     'phabricator-core-buttons-css' => '803864a4',
     'phabricator-core-css' => '803864a4',
     'phabricator-directory-css' => '803864a4',
-    'phabricator-drag-and-drop-file-upload' => '79ad666a',
+    'phabricator-drag-and-drop-file-upload' => '4d8b2d16',
     'phabricator-dropdown-menu' => '21d01ed8',
     'phabricator-jump-nav' => '803864a4',
     'phabricator-keyboard-shortcut' => '21d01ed8',
@@ -2308,7 +2308,7 @@ celerity_register_resource_map(array(
     'phabricator-object-selector-css' => '18be02e0',
     'phabricator-paste-file-upload' => '21d01ed8',
     'phabricator-remarkup-css' => '803864a4',
-    'phabricator-shaped-request' => '79ad666a',
+    'phabricator-shaped-request' => '4d8b2d16',
     'phabricator-standard-page-view' => '803864a4',
     'phabricator-transaction-view-css' => '803864a4',
     'syntax-highlighting-css' => '803864a4',
diff --git a/webroot/rsrc/js/application/core/behavior-object-selector.js b/webroot/rsrc/js/application/core/behavior-object-selector.js
index f1a7057bef..e897df857e 100644
--- a/webroot/rsrc/js/application/core/behavior-object-selector.js
+++ b/webroot/rsrc/js/application/core/behavior-object-selector.js
@@ -150,8 +150,13 @@ JX.behavior('phabricator-object-selector', function(config) {
       var phid = data.handle.phid;
 
       delete phids[phid];
-      JX.DOM.alterClass(button_list[phid], 'disabled', false);
-      button_list[phid].disabled = false;
+
+      // NOTE: We may not have a button in the button list, if this result is
+      // not visible in the current search results.
+      if (button_list[phid]) {
+        JX.DOM.alterClass(button_list[phid], 'disabled', false);
+        button_list[phid].disabled = false;
+      }
 
       redrawAttached();
     });