2 files changed, 8 insertions, 0 deletions
diff --git a/src/components/Pagination/Pagination.js b/src/components/Pagination/Pagination.js
index 8b60f3b..534dab2 100644
--- a/src/components/Pagination/Pagination.js
+++ b/src/components/Pagination/Pagination.js
@@ -51,6 +51,13 @@ class Pagination extends Component {
     this.handlePageChange(this.props.initialIndex);
   }
 
+  componentWillReceiveProps(nextProps) {
+    const { pages, pageRange, initialIndex } = this.props;
+    if (pages !== nextProps.pages || pageRange !== nextProps.pageRange) {
+      this.handlePageChange(initialIndex)
+    }
+  }
+
   handlePageChange(index) {
     this.setState({
       index,
diff --git a/src/components/Pagination/Pagination.module.scss b/src/components/Pagination/Pagination.module.scss
index 2bba764..76debba 100644
--- a/src/components/Pagination/Pagination.module.scss
+++ b/src/components/Pagination/Pagination.module.scss
@@ -23,6 +23,7 @@
 .Selected {
   font-weight: 700;
   color: color(orange);
+  pointer-events: none;
 }
 
 .Ellipse {