diff --git a/src/board/UBBoardController.cpp b/src/board/UBBoardController.cpp
index ac5e2398..161b0fc5 100644
--- a/src/board/UBBoardController.cpp
+++ b/src/board/UBBoardController.cpp
@@ -1522,7 +1522,6 @@ void UBBoardController::setActiveDocumentScene(UBDocumentProxy* pDocumentProxy,
     selectionChanged();
 
     updateBackgroundActionsState(mActiveScene->isDarkBackground(), mActiveScene->isCrossedBackground());
-    updateBackgroundState();
 
     if(documentChange)
         UBGraphicsTextItem::lastUsedTextColor = QColor();
@@ -1642,8 +1641,6 @@ void UBBoardController::changeBackground(bool isDark, bool isCrossed)
 
         mActiveScene->setBackground(isDark, isCrossed);
 
-        updateBackgroundState();
-
         emit backgroundChanged();
     }
 }
@@ -1984,22 +1981,6 @@ void UBBoardController::saveViewState()
     }
 }
 
-
-void UBBoardController::updateBackgroundState()
-{
-    //adjust background style
-    QString newBackgroundStyle;
-
-    if (mActiveScene && mActiveScene->isDarkBackground())
-    {
-        newBackgroundStyle ="QWidget {background-color: #0E0E0E}";
-    }
-    else
-    {
-        newBackgroundStyle ="QWidget {background-color: #F1F1F1}";
-    }
-}
-
 void UBBoardController::stylusToolChanged(int tool)
 {
     if (UBPlatformUtils::hasVirtualKeyboard() && mPaletteManager->mKeyboardPalette)
@@ -2012,7 +1993,6 @@ void UBBoardController::stylusToolChanged(int tool)
         }
     }
 
-    updateBackgroundState();
 }
 
 
diff --git a/src/board/UBBoardController.h b/src/board/UBBoardController.h
index 8ab9b27e..d6e56421 100644
--- a/src/board/UBBoardController.h
+++ b/src/board/UBBoardController.h
@@ -299,7 +299,6 @@ class UBBoardController : public UBDocumentContainer
         void boardViewResized(QResizeEvent* event);
         void documentWillBeDeleted(UBDocumentProxy* pProxy);
         void updateBackgroundActionsState(bool isDark, bool isCrossed);
-        void updateBackgroundState();
         void colorPaletteChanged();
         void libraryDialogClosed(int ret);
         void lastWindowClosed();
diff --git a/src/domain/UBGraphicsScene.cpp b/src/domain/UBGraphicsScene.cpp
index e80a8561..f3ebd071 100644
--- a/src/domain/UBGraphicsScene.cpp
+++ b/src/domain/UBGraphicsScene.cpp
@@ -1712,6 +1712,7 @@ void UBGraphicsScene::deselectAllItems()
 {
     foreach(QGraphicsItem *gi, selectedItems ())
     {
+        gi->clearFocus();
         gi->setSelected(false);
         // Hide selection frame
         if (mSelectionFrame) {