diff --git a/hsmw-context-main b/hsmw-context-main
index 1bf2b9d..8c6ea1d 100644
--- a/hsmw-context-main
+++ b/hsmw-context-main
@@ -6,12 +6,14 @@
 _hsmw_ctx_up() {
     (( __hsmw_ctx_which -- ))
     (( __hsmw_ctx_which < 0 )) && __hsmw_ctx_which=${#__hsmw_ctx_found}-1
+    __hsmw_ctx_idx=0
     _hsmw_ctx_main
 }
 
 _hsmw_ctx_down() {
     (( __hsmw_ctx_which ++ ))
     (( __hsmw_ctx_which >= ${#__hsmw_ctx_found} )) && __hsmw_ctx_which=0
+    __hsmw_ctx_idx=0
     _hsmw_ctx_main
 }