diff --git a/src/core/UBApplicationController.cpp b/src/core/UBApplicationController.cpp
index eb3d858b..daee10dd 100644
--- a/src/core/UBApplicationController.cpp
+++ b/src/core/UBApplicationController.cpp
@@ -375,7 +375,7 @@ void UBApplicationController::showBoard()
 
     mUninoteController->hideWindow();
 
-    mMainWindow->show();
+    UBPlatformUtils::showFullScreen(mMainWindow);
 
     emit mainModeChanged(Board);
 
diff --git a/src/desktop/UBDesktopAnnotationController.cpp b/src/desktop/UBDesktopAnnotationController.cpp
index a5b8e0aa..1fb97835 100644
--- a/src/desktop/UBDesktopAnnotationController.cpp
+++ b/src/desktop/UBDesktopAnnotationController.cpp
@@ -411,13 +411,7 @@ void UBDesktopAnnotationController::hideWindow()
 
 void UBDesktopAnnotationController::goToUniboard()
 {
-    onToolClicked();
-    hideWindow();
-
-    UBPlatformUtils::setDesktopMode(false);
-    UBDrawingController::drawingController()->setInDestopMode(false);
-
-    emit restoreUniboard();
+    UBApplication::applicationController->showBoard();
 }