diff --git a/src/components/Feature/Detail/FeatureHeader.vue b/src/components/Feature/Detail/FeatureHeader.vue
index ea11e1c193abcca6f935fae5aa9505a72904480f..2bc66cd6cc63149510a6daaade98fc36c76755bf 100644
--- a/src/components/Feature/Detail/FeatureHeader.vue
+++ b/src/components/Feature/Detail/FeatureHeader.vue
@@ -48,7 +48,7 @@
               <span
                 v-if="featuresCount"
                 id="feature-count"
-                class="ui button tiny-margin basic"
+                class="ui button tiny-margin basic disabled no-opacity"
               >
                 {{ parseInt($route.query.offset) + 1 }} sur {{ featuresCount }}
               </span>
@@ -285,6 +285,9 @@ export default {
 #feature-actions > div {
   margin-left: .5rem;
 }
+#feature-actions .no-opacity {
+  opacity: 1 !important; /* overide disabled low opacity to customize button style */
+}
 
 @media screen and (max-width: 700px) {
   .two-block {
diff --git a/src/views/Feature/FeatureDetail.vue b/src/views/Feature/FeatureDetail.vue
index 196ac2ae3474cf84656e5994d6af97224e5018cb..c379a86a6aeead3395390d7738b2be440ff7d287 100644
--- a/src/views/Feature/FeatureDetail.vue
+++ b/src/views/Feature/FeatureDetail.vue
@@ -394,6 +394,7 @@ export default {
     },
 
     leavePage() {
+      this.isLeaving = false;
       this.next();
     },