diff --git a/public/js/p3/store/PathwaySummaryMemoryStore.js b/public/js/p3/store/PathwaySummaryMemoryStore.js
index d35b30a768..32db7b3fb9 100644
--- a/public/js/p3/store/PathwaySummaryMemoryStore.js
+++ b/public/js/p3/store/PathwaySummaryMemoryStore.js
@@ -221,7 +221,17 @@ define([
           return true;
         }, function (err) {
           console.error('Error in PathwaySummaryMemoryStore: ', err);
+          Topic.publish('PathwaySummary', 'hideLoadingMask');
+          Topic.publish('PathwaySummary', 'timeOut');
+          setTimeout(function () {  alert('The query took too long or could not be loaded.', err); }, 1000);
         });
+      }, function (err) {
+        console.error('Error in PathwaySummaryMemoryStore: ', err);
+        if (err.message != 'Request canceled') {
+          Topic.publish('PathwaySummary', 'hideLoadingMask');
+          Topic.publish('PathwaySummary', 'timeOut');
+          setTimeout(function () {  alert('The query took too long or could not be loaded.', err); }, 1000);
+        }
       });
       return this._loadingDeferred;
     }
diff --git a/public/js/p3/widget/PathwaySummaryGridContainer.js b/public/js/p3/widget/PathwaySummaryGridContainer.js
index 5697d1ba5f..7a805547e4 100644
--- a/public/js/p3/widget/PathwaySummaryGridContainer.js
+++ b/public/js/p3/widget/PathwaySummaryGridContainer.js
@@ -49,6 +49,9 @@ define([
         return;
       }
       // console.log("PathwaySummaryGridContainer _setStateAttr: ", state);
+      if (!this._firstView) {
+        this._setVisibleAttr(true);
+      }
       if (this.grid) {
         // console.log("   call set state on this.grid: ", this.grid);
         this.grid.set('state', state);
diff --git a/public/js/p3/widget/viewer/PathwaySummary.js b/public/js/p3/widget/viewer/PathwaySummary.js
index b17bc69fbd..d04fc64321 100644
--- a/public/js/p3/widget/viewer/PathwaySummary.js
+++ b/public/js/p3/widget/viewer/PathwaySummary.js
@@ -47,6 +47,9 @@ define([
           case 'updateHeader':
             this.totalCountNode.innerHTML = lang.replace('Out of {summary.total} genes selected, {summary.found} genes found in {summary.pathways} pathways', { summary: value });
             break;
+          case 'timeOut':
+            this.totalCountNode.innerHTML = lang.replace('The query took too long or could not be loaded.');
+            break;
           case 'showLoadingMask':
             this.loadingMask.show();
             break;