diff --git a/CMakeLists.txt b/CMakeLists.txt
index c2882a90..961a2278 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ elseif($ENV{CI_PIPELINE_IID})
 else()
     set(BUILD_NUMBER 0)
 endif()
-project(web-eid VERSION 2.3.0.${BUILD_NUMBER})
+project(web-eid VERSION 2.3.1.${BUILD_NUMBER})
 
 set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 set(MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION_TWEAK})
diff --git a/src/ui/ui.cpp b/src/ui/ui.cpp
index 1dc4dcd0..b43846b1 100644
--- a/src/ui/ui.cpp
+++ b/src/ui/ui.cpp
@@ -22,9 +22,9 @@
 
 #include "webeiddialog.hpp"
 
-WebEidUI* WebEidUI::createAndShowDialog(const CommandType command)
+observer_ptr<WebEidUI> WebEidUI::createAndShowDialog(const CommandType command)
 {
-    auto dialog = new WebEidDialog {};
+    auto *dialog = new WebEidDialog {};
     // close() deletes the dialog automatically if the Qt::WA_DeleteOnClose flag is set.
     dialog->setAttribute(Qt::WA_DeleteOnClose);
 
@@ -32,6 +32,8 @@ WebEidUI* WebEidUI::createAndShowDialog(const CommandType command)
     dialog->activateWindow();
     dialog->show();
     dialog->raise();
+    dialog->hide();
+    dialog->show();
 
     return dialog;
 }