diff --git a/app/assets/javascripts/discourse/components/activity-column.js.es6 b/app/assets/javascripts/discourse/components/activity-column.js.es6
index c0a5269759a..1562a8cbae3 100644
--- a/app/assets/javascripts/discourse/components/activity-column.js.es6
+++ b/app/assets/javascripts/discourse/components/activity-column.js.es6
@@ -37,7 +37,7 @@ export default Ember.Component.extend({
   }.property('bumpedAt', 'createdAt'),
 
   render: function(buffer) {
-    buffer.push(Discourse.Formatter.autoUpdatingRelativeAge(this.get('bumpedAt')));
+    buffer.push("<a href>" + Discourse.Formatter.autoUpdatingRelativeAge(this.get('bumpedAt')) + "</a>");
   },
 
   click: function() {
@@ -45,12 +45,14 @@ export default Ember.Component.extend({
 
     if (Discourse.Mobile.mobileView) {
       Discourse.URL.routeTo(topic.get('lastPostUrl'));
-      return;
+      return false;
     }
 
     this.sendAction('action', {
       topic: topic,
       position: this.$('span').position()
     });
+
+    return false;
   }
 });
diff --git a/app/assets/javascripts/discourse/templates/topic-entrance.js.handlebars b/app/assets/javascripts/discourse/templates/topic-entrance.js.handlebars
index 018f0ece13c..0cff876b3c5 100644
--- a/app/assets/javascripts/discourse/templates/topic-entrance.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/topic-entrance.js.handlebars
@@ -1,4 +1,4 @@
-<button {{action enterTop}} class='btn full no-text'>
+<button {{action enterTop}} class='btn full no-text jump-top'>
   <i class='fa fa-caret-up'></i> {{topDate}}
 </button>
 <button {{action enterBottom}} class='btn full no-text jump-bottom'>
diff --git a/app/assets/javascripts/discourse/views/topic-entrance.js.es6 b/app/assets/javascripts/discourse/views/topic-entrance.js.es6
index 20408d0e375..3ec95e2f140 100644
--- a/app/assets/javascripts/discourse/views/topic-entrance.js.es6
+++ b/app/assets/javascripts/discourse/views/topic-entrance.js.es6
@@ -47,4 +47,10 @@ export default Ember.View.extend({
     this.appEvents.on('dom:clean', this, '_cleanUp');
   }.on('didInsertElement'),
 
+  keyDown: function(e) {
+    if (e.which === 27) {
+      this._cleanUp();
+    }
+  }
+
 });