diff --git a/src/board/UBBoardPaletteManager.cpp b/src/board/UBBoardPaletteManager.cpp
index 89cf5067..bb7324d1 100644
--- a/src/board/UBBoardPaletteManager.cpp
+++ b/src/board/UBBoardPaletteManager.cpp
@@ -664,11 +664,11 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is
                 mRightPalette->assignParent(mContainer);
                 mRightPalette->stackUnder(mStylusPalette);
                 mLeftPalette->stackUnder(mStylusPalette);
-                if (UBPlatformUtils::hasVirtualKeyboard() && mKeyboardPalette != NULL)
+                if (UBPlatformUtils::hasVirtualKeyboard()
+                    && mKeyboardPalette != NULL
+                    && UBSettings::settings()->useSystemOnScreenKeyboard->get().toBool() == false)
                 {
-
-                    if(mKeyboardPalette->m_isVisible)
-                    {
+                    if(mKeyboardPalette->m_isVisible) {
                         mKeyboardPalette->hide();
                         mKeyboardPalette->setParent(UBApplication::boardController->controlContainer());
                         mKeyboardPalette->show();
@@ -698,7 +698,9 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is
                 mRightPalette->assignParent((QWidget*)UBApplication::applicationController->uninotesController()->drawingView());
                 mStylusPalette->raise();
 
-                if (UBPlatformUtils::hasVirtualKeyboard() && mKeyboardPalette != NULL)
+                if (UBPlatformUtils::hasVirtualKeyboard()
+                    && mKeyboardPalette != NULL
+                    && UBSettings::settings()->useSystemOnScreenKeyboard->get().toBool() == false)
                 {
 
                     if(mKeyboardPalette->m_isVisible)
@@ -745,7 +747,9 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is
         case eUBDockPaletteWidget_WEB:
             {
                 mAddItemPalette->setParent(UBApplication::mainWindow);
-                if (UBPlatformUtils::hasVirtualKeyboard() && mKeyboardPalette != NULL)
+                if (UBPlatformUtils::hasVirtualKeyboard()
+                    && mKeyboardPalette != NULL
+                    && UBSettings::settings()->useSystemOnScreenKeyboard->get().toBool() == false)
                 {
 //                    tmp variable?
 //                    WBBrowserWindow* brWnd = UBApplication::webController->GetCurrentWebBrowser();
@@ -769,7 +773,9 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is
                 mRightPalette->setVisible(rightPaletteVisible);
                 mLeftPalette->assignParent(UBApplication::documentController->controlView());
                 mRightPalette->assignParent(UBApplication::documentController->controlView());
-                if (UBPlatformUtils::hasVirtualKeyboard() && mKeyboardPalette != NULL)
+                if (UBPlatformUtils::hasVirtualKeyboard()
+                    && mKeyboardPalette != NULL
+                    && UBSettings::settings()->useSystemOnScreenKeyboard->get().toBool() == false)
                 {
 
                     if(mKeyboardPalette->m_isVisible)
@@ -792,7 +798,9 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is
                 mRightPalette->setVisible(rightPaletteVisible);
                 mLeftPalette->assignParent(0);
                 mRightPalette->assignParent(0);
-                if (UBPlatformUtils::hasVirtualKeyboard() && mKeyboardPalette != NULL)
+                if (UBPlatformUtils::hasVirtualKeyboard()
+                    && mKeyboardPalette != NULL
+                    && UBSettings::settings()->useSystemOnScreenKeyboard->get().toBool() == false)
                 {
 
                     if(mKeyboardPalette->m_isVisible)