diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index be19947bf1..fe9f852ac6 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -970,6 +970,8 @@
 		return
 
 	cut_overlays()
+	if(typing)
+		add_overlay(typing_indicator, TRUE)
 
 	icon			= sprite_datum.sprite_icon
 	icon_state		= sprite_datum.sprite_icon_state
diff --git a/code/modules/pda/pda.dm b/code/modules/pda/pda.dm
index 773f89b2e4..3c3adc9626 100644
--- a/code/modules/pda/pda.dm
+++ b/code/modules/pda/pda.dm
@@ -86,10 +86,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 		. += "The time [stationtime2text()] is displayed in the corner of the screen."
 
 /obj/item/device/pda/CtrlClick()
-	if(issilicon(usr))
-		return
-
-	if(can_use(usr))
+	if(can_use(usr) && !issilicon(usr))
 		remove_pen()
 		return
 	..()