diff --git a/src/lockscreen.c b/src/lockscreen.c
index 8b2d6a4db2fda3678bda7269545c1dae816023ee..2bb0dce9819c0d0c951ffe917200adff5f22356c 100644
--- a/src/lockscreen.c
+++ b/src/lockscreen.c
@@ -17,6 +17,9 @@
 #include "lockscreen.h"
 #include "notifications/notify-manager.h"
 #include "notifications/notification-frame.h"
+#include "osk-button.h"
+#include "osk-manager.h"
+#include "shell.h"
 #include "util.h"
 
 #include <locale.h>
@@ -86,6 +89,7 @@ typedef struct {
 
   /* unlock page */
   GtkWidget         *box_unlock;
+  GtkWidget         *keypad_revealer;
   GtkWidget         *keypad;
   GtkWidget         *entry_pin;
   GtkGesture        *long_press_del_gesture;
@@ -162,15 +166,16 @@ clear_input (PhoshLockscreen *self, gboolean clear_all)
   }
 }
 
-
 static void
 show_info_page (PhoshLockscreen *self)
 {
+  PhoshShell *shell = phosh_shell_get_default ();
   PhoshLockscreenPrivate *priv = phosh_lockscreen_get_instance_private (self);
 
   if (hdy_carousel_get_position (HDY_CAROUSEL (priv->carousel)) <= 0)
     return;
 
+  phosh_osk_manager_set_visible  (phosh_shell_get_osk_manager (shell), FALSE);
   hdy_carousel_scroll_to (HDY_CAROUSEL (priv->carousel), priv->box_info);
 }
 
@@ -251,6 +256,8 @@ auth_async_cb (PhoshAuth *auth, GAsyncResult *result, PhoshLockscreen *self)
   PhoshLockscreenPrivate *priv;
   GError *error = NULL;
   gboolean authenticated;
+  PhoshShell *shell = phosh_shell_get_default ();
+  PhoshOskManager *oskManager = phosh_shell_get_osk_manager (shell);
 
   priv = phosh_lockscreen_get_instance_private (self);
   authenticated = phosh_auth_authenticate_async_finish (auth, result, &error);
@@ -261,6 +268,8 @@ auth_async_cb (PhoshAuth *auth, GAsyncResult *result, PhoshLockscreen *self)
 
   g_object_ref (self);
   if (authenticated) {
+    /*Hide OSK*/
+    phosh_osk_manager_set_visible (oskManager, FALSE);
     g_signal_emit (self, signals[LOCKSCREEN_UNLOCK], 0);
     g_clear_object (&priv->auth);
   } else {
@@ -603,6 +612,7 @@ phosh_lockscreen_constructed (GObject *object)
   PhoshLockscreenPrivate *priv = phosh_lockscreen_get_instance_private (self);
   const char *active;
   PhoshNotifyManager *manager;
+  PhoshShell *shell;
 
   G_OBJECT_CLASS (phosh_lockscreen_parent_class)->constructed (object);
 
@@ -659,6 +669,12 @@ phosh_lockscreen_constructed (GObject *object)
                            G_CONNECT_SWAPPED);
   on_notifcation_items_changed (self, -1, -1, -1,
                                 G_LIST_MODEL (phosh_notify_manager_get_list (manager)));
+
+  shell = phosh_shell_get_default ();
+  g_object_bind_property (phosh_shell_get_osk_manager (shell), "visible",
+                          priv->keypad_revealer, "reveal-child",
+                          G_BINDING_SYNC_CREATE | G_BINDING_INVERT_BOOLEAN);
+
 }
 
 static void
@@ -723,6 +739,7 @@ phosh_lockscreen_class_init (PhoshLockscreenClass *klass)
                                          NULL, G_TYPE_NONE, 0);
 
   g_type_ensure (PHOSH_TYPE_KEYPAD);
+  g_type_ensure (PHOSH_TYPE_OSK_BUTTON);
   gtk_widget_class_set_css_name (widget_class, "phosh-lockscreen");
   gtk_widget_class_set_template_from_resource (widget_class,
                                                "/sm/puri/phosh/ui/lockscreen.ui");
@@ -734,6 +751,7 @@ phosh_lockscreen_class_init (PhoshLockscreenClass *klass)
   /* unlock page */
   gtk_widget_class_bind_template_child_private (widget_class, PhoshLockscreen, box_unlock);
   gtk_widget_class_bind_template_child_private (widget_class, PhoshLockscreen, keypad);
+  gtk_widget_class_bind_template_child_private (widget_class, PhoshLockscreen, keypad_revealer);
   gtk_widget_class_bind_template_child_private (widget_class, PhoshLockscreen, entry_pin);
   gtk_widget_class_bind_template_child_private (widget_class, PhoshLockscreen, lbl_unlock_status);
   gtk_widget_class_bind_template_child_private (widget_class, PhoshLockscreen, long_press_del_gesture);
diff --git a/src/ui/lockscreen.ui b/src/ui/lockscreen.ui
index 80ef467382c64cfdf7dca41d5cec36cacce762a2..5ba936ec6d407f3feedf602a9208c44b256b28ca 100644
--- a/src/ui/lockscreen.ui
+++ b/src/ui/lockscreen.ui
@@ -286,15 +286,21 @@
                   </object>
                 </child>
                 <child>
-                  <object class="PhoshKeypad" id="keypad">
+                  <object class="GtkRevealer" id="keypad_revealer">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">center</property>
-                    <property name="valign">center</property>
-                    <property name="margin_top">12</property>
-                    <property name="margin_bottom">12</property>
-                    <property name="entry">entry_pin</property>
-                    <property name="end-action">btn_delete</property>
+                    <child>
+                      <object class="PhoshKeypad" id="keypad">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="halign">center</property>
+                        <property name="valign">center</property>
+                        <property name="margin_top">12</property>
+                        <property name="margin_bottom">12</property>
+                        <property name="entry">entry_pin</property>
+                        <property name="start-action">btn_keyboard</property>
+                        <property name="end-action">btn_delete</property>
+                      </object>
+                    </child>
                   </object>
                 </child>
                 <child>
@@ -397,6 +403,11 @@
       </object>
     </child>
   </object>
+  <object class="PhoshOskButton" id="btn_keyboard">
+    <property name="visible">True</property>
+    <property name="can_focus">True</property>
+    <property name="focus_on_click">False</property>
+  </object>
   <object class="GtkGestureLongPress" id="long_press_del_gesture">
     <property name="widget">btn_delete</property>
     <signal name="pressed" handler="long_press_del_cb" object="PhoshLockscreen" swapped="true"/>