diff --git a/spine.c b/spine.c
index 0836ab0..e1a9f8d 100644
--- a/spine.c
+++ b/spine.c
@@ -336,6 +336,7 @@ confirm(void) {
 static int
 spinecmdhandler (pinentry_t recieved_pinentry) {
 	text[0]='\0';
+	cursor = 0;
 	pinentry = recieved_pinentry;
 
 	if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
@@ -369,8 +370,7 @@ spinecmdhandler (pinentry_t recieved_pinentry) {
 pinentry_cmd_handler_t pinentry_cmd_handler = spinecmdhandler;
 
 int
-main(int argc, char *argv[]){
-
+main(int argc, char *argv[]) {
 	pinentry_init("spine");
 	pinentry_parse_opts(argc, argv);
 	if (pinentry_loop())
diff --git a/spinetest b/spinetest
index 577b278..35d32bc 100755
--- a/spinetest
+++ b/spinetest
@@ -2,6 +2,8 @@
 echo "SETDESC testing spine, type whatever
 SETPROMPT whatever:
 GETPIN
+SETDESC type more of whatever:
+GETPIN
 SETDESC testing confirmation
 confirm
 BYE" | ./spine