diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/public/js/user-menu.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/public/js/user-menu.js
index c22b5c2923..f5e03d86c8 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/public/js/user-menu.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/public/js/user-menu.js
@@ -28,6 +28,16 @@ function inputIsValid(regExp, inputString) {
     return regExp.test(inputString);
 }
 
+/*
+ * Fix for the modal popup overlay disappear bug
+ */
+$('.modal').on('hidden.bs.modal',function(){
+    if($('.modal-backdrop').length == 2){
+        $('.modal-backdrop')[0].remove()
+    }
+});
+
+
 $(document).ready(function () {
     var modalPopup = ".modal";
     // var modalPopupContainer = modalPopup + " .modal-content";