diff --git a/frappe/public/css/desk.css b/frappe/public/css/desk.css
index f5193dac9d..8b1dacd667 100644
--- a/frappe/public/css/desk.css
+++ b/frappe/public/css/desk.css
@@ -1084,6 +1084,9 @@ input[type="checkbox"]:checked:before {
   margin: -2px 0 0 3px;
   border: 1px solid rgba(0, 0, 0, 0.25);
 }
+.slides-wrapper:focus {
+  outline: none;
+}
 .slides-wrapper .fa-circle {
   font-size: 10px;
   margin: 0px 2px;
@@ -1094,6 +1097,9 @@ input[type="checkbox"]:checked:before {
 .slides-wrapper .fa-circle.link {
   cursor: pointer;
 }
+.slides-wrapper .slide-wrapper:focus {
+  outline: none;
+}
 .slides-wrapper .form {
   margin-top: 30px;
 }
diff --git a/frappe/public/js/frappe/ui/toolbar/navbar.html b/frappe/public/js/frappe/ui/toolbar/navbar.html
index 4e92bc9ac5..fed120d79d 100644
--- a/frappe/public/js/frappe/ui/toolbar/navbar.html
+++ b/frappe/public/js/frappe/ui/toolbar/navbar.html
@@ -11,7 +11,7 @@
 		<div class="navbar-center ellipsis" style="display: none;"></div>
 
 		<ul class="nav navbar-nav navbar-right">
-			<li class="user-progress">
+			<li class="user-progress hide">
 				<a class="dropdown-toggle" data-toggle="dropdown" href="#" onclick="return false;"  style="height: 40px;">
 					<div class="progress-chart" style"width: 50px; margin-top: 8px;"><div class="progress">
 						<div class="progress-bar"></div>
diff --git a/frappe/public/js/frappe/ui/toolbar/toolbar.js b/frappe/public/js/frappe/ui/toolbar/toolbar.js
index 474d00ccf5..ba103dec9f 100644
--- a/frappe/public/js/frappe/ui/toolbar/toolbar.js
+++ b/frappe/public/js/frappe/ui/toolbar/toolbar.js
@@ -195,18 +195,17 @@ frappe.ui.toolbar.Toolbar = Class.extend({
 
 	setup_progress_dialog: function() {
 		var me = this;
-		$('.user-progress').hide();
 		frappe.call({
 			method: "frappe.desk.user_progress.get_user_progress_slides",
 			callback: function(r) {
 				if(r.message) {
 					let slides = r.message;
-					if(slides.length) {
+					if(slides.length && slides.map(s => parseInt(s.done)).includes(0)) {
 						frappe.require("assets/frappe/js/frappe/ui/toolbar/user_progress_dialog.js", function() {
 							me.progress_dialog = new frappe.setup.UserProgressDialog({
 								slides: slides
 							});
-							$('.user-progress').show();
+							$('.user-progress').removeClass('hide');
 							$('.user-progress .dropdown-toggle').on('click', () => {
 								me.progress_dialog.show();
 							});
diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less
index 7272ff955f..786c05461b 100644
--- a/frappe/public/less/desk.less
+++ b/frappe/public/less/desk.less
@@ -1027,6 +1027,9 @@ input[type="checkbox"] {
 
 // Slides
 .slides-wrapper {
+	&:focus {
+		outline: none;
+	}
 	.fa-circle {
 		font-size: 10px;
 		margin: 0px 2px;
@@ -1037,6 +1040,11 @@ input[type="checkbox"] {
 			cursor: pointer;
 		}
 	}
+	.slide-wrapper {
+		&:focus {
+			outline: none;
+		}
+	}
 	.form {
 		margin-top: 30px;
 		.form-layout {