diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index 6dd44c26e0b..2a4d0b2aa45 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -75,7 +75,7 @@ gulp.task('init-watch', () => {
   });
   $.watch('src/sass/**/*.scss', () => gulp.start('sass'));
   $.watch('node_modules/rancher-website-theme/**/*.scss', () => gulp.start('sass'));
-  $.watch('src/js/**/*.js', () => gulp.start('js-watch'));
+  $.watch('src/js/**/*.js', () => gulp.start('js'));
   $.watch('src/img/**/*', () => gulp.start('img'));
   $.watch(['archetypes/**/*', 'data/**/*', 'content/**/*', 'layouts/**/*', 'static/**/*', 'themes/**/*', 'node_modules/rancher-website-theme/**/*', 'config.toml'], () => gulp.start('hugo-dev'));
 });
@@ -98,11 +98,6 @@ gulp.task('sass', () => {
     .pipe(browserSync.stream());
 });
 
-gulp.task('js-watch', ['js'], (cb) => {
-  browserSync.reload();
-  cb();
-});
-
 const vendors = ['ml-stack-nav', 'lory.js', 'tingle.js', 'moment', 'jquery'];
 
 gulp.task('build:vendor', () => {
diff --git a/src/js/app.js b/src/js/app.js
index 87b3c3fba51..d4075367edd 100644
--- a/src/js/app.js
+++ b/src/js/app.js
@@ -193,10 +193,14 @@ const bootstrapNav = function () {
       e.preventDefault();
       e.stopPropagation();
 
-      // parent li rather then actual el clicked
-      $(e.currentTarget).toggleClass('open');
 
-      $(e.target).find('>ul.tree-nav-sublist').toggleClass('hide');
+      let sub = $(e.currentTarget).find('>ul.tree-nav-sublist')// || $(e.target).next('ul.tree-nav-sublist');
+      if (sub.length > 0) {
+        sub.toggleClass('hide');
+
+        // parent li rather then actual el clicked
+        $(e.currentTarget).toggleClass('open');
+      }
     }
 
   });