diff --git a/qml/key/CapslockKey.qml b/qml/key/CapslockKey.qml
index 423b0378ab28464bfcef6ff18f7486016f074e51..57988e053b407666884864742f77ac9a12d5cdba 100755
--- a/qml/key/CapslockKey.qml
+++ b/qml/key/CapslockKey.qml
@@ -22,8 +22,17 @@ SwitchKey {
     label: "Caps"
 
     switchKeyState: virtualKeyboard.capslockState
-    multiPointTouchArea.onReleased: {
+    multiPointTouchArea.onPressed: {
         if(virtualKeyboard.capslockState == "NORMAL") {
+            virtualKeyboard.capslockState = "NORMAL_PRESSED"
+        } else if (virtualKeyboard.capslockState == "OPEN") {
+            virtualKeyboard.capslockState = "OPEN_PRESSED"
+        }
+    }
+
+    multiPointTouchArea.onReleased: {
+        if(virtualKeyboard.capslockState == "NORMAL" ||
+                virtualKeyboard.capslockState == "NORMAL_PRESSED") {
             virtualKeyboard.capslockState = "OPEN"
         } else {
             virtualKeyboard.capslockState = "NORMAL"
@@ -58,6 +67,28 @@ SwitchKey {
                 target: keyBackground
                 state: "OPEN"
             }
+        },
+        State {
+            name: "NORMAL_PRESSED"
+            PropertyChanges {
+                target: virtualKeyboard
+                letterState : virtualKeyboard.shiftState == "NORMAL" ? "SHIFT" : "NORMAL"
+            }
+            PropertyChanges {
+                target: keyBackground
+                state: "PRESSED"
+            }
+        },
+        State {
+            name: "OPEN_PRESSED"
+            PropertyChanges {
+                target: virtualKeyboard
+                letterState : virtualKeyboard.shiftState == "NORMAL" ? "NORMAL" : "SHIFT"
+            }
+            PropertyChanges {
+                target: keyBackground
+                state: "OPEN_PRESSED"
+            }
         }
     ]