diff --git a/src/board/UBBoardPaletteManager.cpp b/src/board/UBBoardPaletteManager.cpp
index 2756f99a..1fca96f5 100644
--- a/src/board/UBBoardPaletteManager.cpp
+++ b/src/board/UBBoardPaletteManager.cpp
@@ -756,7 +756,11 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is
                     if(mKeyboardPalette->m_isVisible)
                     {
                         mKeyboardPalette->hide();
+#ifndef Q_WS_X11
                         mKeyboardPalette->setParent((QWidget*)UBApplication::applicationController->uninotesController()->drawingView());
+#else
+                        mKeyboardPalette->setParent(0);
+#endif
                         mKeyboardPalette->show();
                     }
                     else
diff --git a/src/desktop/UBDesktopAnnotationController.cpp b/src/desktop/UBDesktopAnnotationController.cpp
index 9bf8a694..aa4b0504 100644
--- a/src/desktop/UBDesktopAnnotationController.cpp
+++ b/src/desktop/UBDesktopAnnotationController.cpp
@@ -97,9 +97,9 @@ UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent)
     if (UBPlatformUtils::hasVirtualKeyboard())
     {
 #ifdef Q_WS_X11
-        mKeyboardPalette = UBKeyboardPalette::create(0);
-        connect(mTransparentDrawingView, SIGNAL(hidden()), mKeyboardPalette, SLOT(hide()));
-        connect(mTransparentDrawingView, SIGNAL(shown()), this, SLOT(showKeyboard()));
+//        mKeyboardPalette = UBKeyboardPalette::create(0);
+//        connect(mTransparentDrawingView, SIGNAL(hidden()), mKeyboardPalette, SLOT(hide()));
+//        connect(mTransparentDrawingView, SIGNAL(shown()), this, SLOT(showKeyboard()));
 #else
 //        mKeyboardPalette = UBKeyboardPalette::create(mTransparentDrawingView);
 //        mKeyboardPalette->setParent(mTransparentDrawingView);
@@ -111,7 +111,7 @@ UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent)
 //                 mTransparentDrawingView, SLOT(virtualKeyboardActivated(bool)));
 
 #ifdef Q_WS_X11
-        connect(mKeyboardPalette, SIGNAL(moved(QPoint)), this, SLOT(refreshMask()));
+        connect(UBApplication::boardController->paletteManager()->mKeyboardPalette, SIGNAL(moved(QPoint)), this, SLOT(refreshMask()));
         connect(mDesktopPalette,SIGNAL(refreshMask()), this, SLOT(refreshMask()));
 #endif
     }
@@ -985,4 +985,4 @@ void UBDesktopAnnotationController::refreshMask()
     {
         updateMask(true);
     }
-}
\ No newline at end of file
+}
diff --git a/src/web/UBWebController.cpp b/src/web/UBWebController.cpp
index 463354ef..26ddd181 100644
--- a/src/web/UBWebController.cpp
+++ b/src/web/UBWebController.cpp
@@ -32,7 +32,7 @@
 #include "gui/UBScreenMirror.h"
 #include "gui/UBMainWindow.h"
 #include "gui/UBWebToolsPalette.h"
-//#include "gui/UBKeyboardPalette.h"
+#include "gui/UBKeyboardPalette.h"
 
 #include "core/UBSettings.h"
 #include "core/UBSetting.h"
@@ -46,6 +46,7 @@
 #include "domain/UBGraphicsScene.h"
 
 #include "desktop/UBCustomCaptureWindow.h"
+#include "board/UBBoardPaletteManager.h"
 
 
 UBWebController::UBWebController(UBMainWindow* mainWindow)
@@ -393,8 +394,9 @@ void UBWebController::setupPalettes()
 
 //        (*mKeyboardCurrentPalette) = UBKeyboardPalette::create(*mCurrentWebBrowser);
 #ifndef Q_WS_WIN
-        if (*mKeyboardCurrentPalette)
-            connect(*mKeyboardCurrentPalette, SIGNAL(closed()), *mKeyboardCurrentPalette, SLOT(onDeactivated()));
+        if (UBPlatformUtils::hasVirtualKeyboard() && UBApplication::boardController->paletteManager()->mKeyboardPalette)
+            connect(UBApplication::boardController->paletteManager()->mKeyboardPalette, SIGNAL(closed()),
+                    UBApplication::boardController->paletteManager()->mKeyboardPalette, SLOT(onDeactivated()));
 #endif
 
         connect(mMainWindow->actionWebTrapFlash, SIGNAL(triggered()), this, SLOT(trapFlash()));