diff --git a/ICViewPager/ICViewPager/ViewPagerController.m b/ICViewPager/ICViewPager/ViewPagerController.m
index 4281853..032232b 100644
--- a/ICViewPager/ICViewPager/ViewPagerController.m
+++ b/ICViewPager/ICViewPager/ViewPagerController.m
@@ -141,6 +141,7 @@ @interface ViewPagerController () <UIPageViewControllerDataSource, UIPageViewCon
 @property (nonatomic) NSUInteger activeContentIndex;
 
 @property (getter = isAnimatingToTab, assign) BOOL animatingToTab;
+@property (getter = isShouldClicked, assign) BOOL shouldClicked;
 @property (getter = isDefaultSetupDone, assign) BOOL defaultSetupDone;
 
 // Colors
@@ -233,6 +234,8 @@ - (IBAction)handleTapGesture:(id)sender {
     UIView *tabView = tapGestureRecognizer.view;
     __block NSUInteger index = [self.tabs indexOfObject:tabView];
     
+    self.shouldClicked = YES;
+    
     //if Tap is not selected Tab(new Tab)
     if (self.activeTabIndex != index) {
         // Select the tab
@@ -386,6 +389,7 @@ - (void)setActiveContentIndex:(NSUInteger)activeContentIndex {
                                            animated:YES
                                          completion:^(BOOL completed) {
                                              
+                                             weakSelf.shouldClicked = NO;
                                              weakSelf.animatingToTab = NO;
                                              
                                              // Set the current page again to obtain synchronisation between tabs and content
@@ -403,6 +407,7 @@ - (void)setActiveContentIndex:(NSUInteger)activeContentIndex {
                                           direction:(activeContentIndex < self.activeContentIndex) ? UIPageViewControllerNavigationDirectionReverse : UIPageViewControllerNavigationDirectionForward
                                            animated:YES
                                          completion:^(BOOL completed) {
+                                             weakSelf.shouldClicked = NO;
                                              weakSelf.animatingToTab = NO;
                                          }];
     }
@@ -579,7 +584,7 @@ - (void)selectTabAtIndex:(NSUInteger)index {
         return;
     }
     
-    self.animatingToTab = YES;
+    self.animatingToTab = NO;
     
     // Set activeTabIndex
     self.activeTabIndex = index;
@@ -758,6 +763,7 @@ - (void)defaultSettings {
     self.pageViewController.delegate = self;
     
     self.animatingToTab = NO;
+    self.shouldClicked = NO;
     self.defaultSetupDone = NO;
 }
 - (void)defaultSetup {
@@ -965,7 +971,7 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
         [self.actualDelegate scrollViewDidScroll:scrollView];
     }
     
-    if (![self isAnimatingToTab]) {
+    if (![self isAnimatingToTab] && !self.shouldClicked) {
         UIView *tabView = [self tabViewAtIndex:self.activeTabIndex];
         
         // Get the related tab view position