diff --git a/src/applications/files/application/PhabricatorFilesApplication.php b/src/applications/files/application/PhabricatorFilesApplication.php
index 4b1cb253b..5f3fb797c 100644
--- a/src/applications/files/application/PhabricatorFilesApplication.php
+++ b/src/applications/files/application/PhabricatorFilesApplication.php
@@ -1,132 +1,138 @@
 <?php
 
 final class PhabricatorFilesApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/file/';
   }
 
   public function getName() {
     return pht('Files');
   }
 
   public function getShortDescription() {
     return pht('Store and Share Files');
   }
 
   public function getIcon() {
     return 'fa-file';
   }
 
   public function getTitleGlyph() {
     return "\xE2\x87\xAA";
   }
 
   public function getFlavorText() {
     return pht('Blob store for Pokemon pictures.');
   }
 
   public function getApplicationGroup() {
     return self::GROUP_UTILITIES;
   }
 
   public function canUninstall() {
     return false;
   }
 
   public function getRemarkupRules() {
     return array(
       new PhabricatorEmbedFileRemarkupRule(),
       new PhabricatorImageRemarkupRule(),
     );
   }
 
   public function supportsEmailIntegration() {
     return true;
   }
 
   public function getAppEmailBlurb() {
     return pht(
       'Send emails with file attachments to these addresses to upload '.
       'files. %s',
       phutil_tag(
         'a',
         array(
           'href' => $this->getInboundEmailSupportLink(),
         ),
         pht('Learn More')));
   }
 
   protected function getCustomCapabilities() {
     return array(
       FilesDefaultViewCapability::CAPABILITY => array(
         'caption' => pht('Default view policy for newly created files.'),
         'template' => PhabricatorFileFilePHIDType::TYPECONST,
         'capability' => PhabricatorPolicyCapability::CAN_VIEW,
       ),
     );
   }
 
   public function getRoutes() {
     return array(
       '/F(?P<id>[1-9]\d*)' => 'PhabricatorFileInfoController',
       '/file/' => array(
         '(query/(?P<queryKey>[^/]+)/)?' => 'PhabricatorFileListController',
         'upload/' => 'PhabricatorFileUploadController',
         'dropupload/' => 'PhabricatorFileDropUploadController',
         'compose/' => 'PhabricatorFileComposeController',
         'comment/(?P<id>[1-9]\d*)/' => 'PhabricatorFileCommentController',
         'delete/(?P<id>[1-9]\d*)/' => 'PhabricatorFileDeleteController',
         'edit/(?P<id>[1-9]\d*)/' => 'PhabricatorFileEditController',
         'info/(?P<phid>[^/]+)/' => 'PhabricatorFileInfoController',
         'imageproxy/' => 'PhabricatorFileImageProxyController',
         'transforms/(?P<id>[1-9]\d*)/' =>
           'PhabricatorFileTransformListController',
         'uploaddialog/(?P<single>single/)?'
           => 'PhabricatorFileUploadDialogController',
         'download/(?P<phid>[^/]+)/' => 'PhabricatorFileDialogController',
         'iconset/(?P<key>[^/]+)/' => array(
           'select/' => 'PhabricatorFileIconSetSelectController',
         ),
       ) + $this->getResourceSubroutes(),
     );
   }
 
   public function getResourceRoutes() {
     return array(
       '/file/' => $this->getResourceSubroutes(),
     );
   }
 
   private function getResourceSubroutes() {
     return array(
       'data/'.
         '(?:@(?P<instance>[^/]+)/)?'.
         '(?P<key>[^/]+)/'.
         '(?P<phid>[^/]+)/'.
         '(?:(?P<token>[^/]+)/)?'.
         '.*'
         => 'PhabricatorFileDataController',
       'xform/'.
         '(?:@(?P<instance>[^/]+)/)?'.
         '(?P<transform>[^/]+)/'.
         '(?P<phid>[^/]+)/'.
         '(?P<key>[^/]+)/'
         => 'PhabricatorFileTransformController',
     );
   }
 
   public function getMailCommandObjects() {
     return array(
       'file' => array(
         'name' => pht('Email Commands: Files'),
         'header' => pht('Interacting with Files'),
         'object' => new PhabricatorFile(),
         'summary' => pht(
           'This page documents the commands you can use to interact with '.
           'files.'),
       ),
     );
   }
 
+  public function getQuicksandURIPatternBlacklist() {
+    return array(
+      '/file/data/.*',
+    );
+  }
+
 }
diff --git a/webroot/rsrc/js/core/behavior-lightbox-attachments.js b/webroot/rsrc/js/core/behavior-lightbox-attachments.js
index 9b4967012..40022b188 100644
--- a/webroot/rsrc/js/core/behavior-lightbox-attachments.js
+++ b/webroot/rsrc/js/core/behavior-lightbox-attachments.js
@@ -1,258 +1,255 @@
 /**
  * @provides javelin-behavior-lightbox-attachments
  * @requires javelin-behavior
  *           javelin-stratcom
  *           javelin-dom
  *           javelin-mask
  *           javelin-util
  *           phuix-icon-view
  *           phabricator-busy
  */
 
 JX.behavior('lightbox-attachments', function (config) {
 
   var lightbox     = null;
   var prev         = null;
   var next         = null;
   var downloadForm = JX.$H(config.downloadForm).getFragment().firstChild;
 
   function loadLightBox(e) {
     if (!e.isNormalClick()) {
       return;
     }
 
-    if (JX.Stratcom.pass()) {
-      return;
-    }
-    e.prevent();
+    e.kill();
 
     var links = JX.DOM.scry(document, 'a', 'lightboxable');
     var phids = {};
     var data;
     for (var i = 0; i < links.length; i++) {
       data = JX.Stratcom.getData(links[i]);
       phids[data.phid] = links[i];
     }
 
     // Now that we have the big picture phid situation sorted out, figure
     // out how the actual node the user clicks fits into that big picture
     // and build some pretty UI to show the attachment.
     var target      = e.getNode('lightboxable');
     var target_data = JX.Stratcom.getData(target);
     var total       = JX.keys(phids).length;
     var current     = 1;
     var past_target = false;
     for (var phid in phids) {
       if (past_target) {
         next = phids[phid];
         break;
       } else if (phid == target_data.phid) {
         past_target = true;
       } else {
         prev = phids[phid];
         current++;
       }
     }
 
     var img_uri = '';
     var extra_status = '';
     var name_element = '';
     // for now, this conditional is always true
     // revisit if / when we decide to add non-images to lightbox view
     if (target_data.viewable) {
       img_uri = target_data.uri;
     } else {
       img_uri = config.defaultImageUri;
       extra_status = ' Image may not be representative of actual attachment.';
       name_element = JX.$N('div',
                            { className : 'attachment-name' },
                            target_data.name
                           );
     }
 
     var alt_name = '';
     if (typeof target_data.name != 'undefined') {
       alt_name = target_data.name;
     }
 
     var img = JX.$N('img',
                     {
                       className : 'loading',
                       alt       : alt_name
                     }
                    );
 
     lightbox = JX.$N('div',
                      {
                        className : 'lightbox-attachment',
                        sigil: 'lightbox-attachment'
                      },
                      img
                     );
 
     var statusSpan = JX.$N('span',
                            {
                              className: 'lightbox-status-txt'
                            },
                            'Image '+current+' of '+total+'.'+extra_status
                            );
 
     var downloadSpan = JX.$N('span',
                             {
                               className : 'lightbox-download'
                             });
     var closeButton = JX.$N('a',
                          {
                            className : 'lightbox-close button grey',
                            href : '#'
                          },
                         'Close');
     var statusHTML = JX.$N('div',
                            {
                              className : 'lightbox-status'
                            },
                            [statusSpan, closeButton, downloadSpan]
                           );
     JX.DOM.appendContent(lightbox, statusHTML);
     JX.DOM.appendContent(lightbox, name_element);
     JX.DOM.listen(closeButton, 'click', null, closeLightBox);
 
     var leftIcon = '';
     if (next) {
       var r_icon = new JX.PHUIXIconView()
         .setIcon('fa-angle-right')
         .setColor('lightgreytext')
         .getNode();
       leftIcon = JX.$N('a',
                        {
                          className : 'lightbox-right',
                          href : '#'
                        },
                        r_icon);
       JX.DOM.listen(leftIcon,
                     'click',
                     null,
                     JX.bind(null, loadAnotherLightBox, next)
                    );
     }
     JX.DOM.appendContent(lightbox, leftIcon);
     var rightIcon = '';
     if (prev) {
       var l_icon = new JX.PHUIXIconView()
         .setIcon('fa-angle-left')
         .setColor('lightgreytext')
         .getNode();
       rightIcon = JX.$N('a',
                         {
                           className : 'lightbox-left',
                           href : '#'
                         },
                         l_icon);
       JX.DOM.listen(rightIcon,
                     'click',
                     null,
                     JX.bind(null, loadAnotherLightBox, prev)
                    );
     }
     JX.DOM.appendContent(lightbox, rightIcon);
 
     JX.DOM.alterClass(document.body, 'lightbox-attached', true);
     JX.Mask.show('jx-dark-mask');
 
     downloadForm.action = target_data.dUri;
     downloadSpan.appendChild(downloadForm);
 
     document.body.appendChild(lightbox);
 
     JX.Busy.start();
     img.onload = function() {
       JX.DOM.alterClass(img, 'loading', false);
       JX.Busy.done();
     };
 
     img.src = img_uri;
   }
 
   // TODO - make this work with KeyboardShortcut, which means
   // making an uninstall / de-register for KeyboardShortcut
   function lightBoxHandleKeyDown(e) {
     if (!lightbox) {
       return;
     }
     var raw = e.getRawEvent();
     if (raw.altKey || raw.ctrlKey || raw.metaKey) {
       return;
     }
     if (JX.Stratcom.pass()) {
       return;
     }
 
     var handler = JX.bag;
     switch (e.getSpecialKey()) {
       case 'esc':
         handler = closeLightBox;
         break;
       case 'right':
       if (next) {
           handler = JX.bind(null, loadAnotherLightBox, next);
         }
         break;
       case 'left':
         if (prev) {
           handler = JX.bind(null, loadAnotherLightBox, prev);
         }
         break;
     }
     return handler(e);
   }
 
   function closeLightBox(e) {
     if (!lightbox) {
       return;
     }
     e.prevent();
     JX.DOM.remove(lightbox);
     JX.Mask.hide();
     JX.DOM.alterClass(document.body, 'lightbox-attached', false);
     lightbox = null;
     prev     = null;
     next     = null;
   }
 
   function loadAnotherLightBox(el, e) {
     if (!el) {
       return;
     }
     e.prevent();
     closeLightBox(e);
     el.click();
   }
 
   JX.Stratcom.listen(
     'click',
-    ['lightboxable', 'tag:a'],
+    ['lightboxable'],
     loadLightBox);
 
   JX.Stratcom.listen(
     'keydown',
     null,
     lightBoxHandleKeyDown);
 
   // When the user clicks the background, close the lightbox.
   JX.Stratcom.listen(
     'click',
     'lightbox-attachment',
     function (e) {
       if (!lightbox) {
         return;
       }
       if (e.getTarget() != e.getNode('lightbox-attachment')) {
         // Don't close if they clicked some other element, like the image
         // itself or the next/previous arrows.
         return;
       }
       closeLightBox(e);
       e.kill();
     });
 
 });