diff --git a/background.html b/background.html
index cf19ca37..2abbb6d8 100755
--- a/background.html
+++ b/background.html
@@ -202,7 +202,7 @@
     }
     this.currentCallback = callback;
 
-    if(cacheOnly) {
+    if(cacheOnly || syncNew) {
       if(this.currentScroll == 0) {
         if(this.currentPage > this.maxCachedPages) {
           this.currentPage = this.maxCachedPages;
@@ -1207,7 +1207,7 @@
       callback([], timelineId);
       return;
     }
-    if(syncNew && this.unifiedVisible) {
+    if(syncNew && this.unifiedVisible && timelineId != 'unified') {
       var timelineBaseId = timelineId.replace(/_.*$/, '');
       if(OptionsBackend.get(timelineBaseId + '_include_unified')) {
         var originalCallback = callback;
diff --git a/popup.html b/popup.html
index c731d3a3..a53d36c0 100755
--- a/popup.html
+++ b/popup.html
@@ -434,6 +434,9 @@
   },
 
   refreshNew: function() {
+    if($("#loading").is(":visible")) {
+      return;
+    }
     loadTimeline(true);
   }
 }