diff --git a/pdcurses/kernel.c b/pdcurses/kernel.c
index 9acac420..a639efbe 100644
--- a/pdcurses/kernel.c
+++ b/pdcurses/kernel.c
@@ -36,7 +36,7 @@
 # undef wmove
 #endif
 
-RCSID("$Id: kernel.c,v 1.50 2006/07/23 14:54:17 wmcbrine Exp $");
+RCSID("$Id: kernel.c,v 1.51 2006/07/23 18:56:28 wmcbrine Exp $");
 
 RIPPEDOFFLINE linesripped[5];
 char linesrippedoff = 0;
@@ -162,8 +162,7 @@ static int PDC_restore_mode(struct cttyset *ctty)
 		if (ctty->saved.raw_out)
 			raw();
 
-		if (ctty->saved.visible_cursor)
-			PDC_cursor_on();
+		curs_set(ctty->saved.visibility);
 
 		SP->font = PDC_get_font();
 		PDC_set_font(ctty->saved.font);
diff --git a/pdcurses/outopts.c b/pdcurses/outopts.c
index caa0ecaf..cc3c47d5 100644
--- a/pdcurses/outopts.c
+++ b/pdcurses/outopts.c
@@ -29,7 +29,7 @@
 #undef scrollok
 #undef raw_output
 
-RCSID("$Id: outopts.c,v 1.22 2006/07/15 15:38:24 wmcbrine Exp $");
+RCSID("$Id: outopts.c,v 1.23 2006/07/23 18:56:28 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
@@ -161,10 +161,7 @@ int leaveok(WINDOW *win, bool bf)
 
 	win->_leaveit = bf;
 
-	if (bf)
-		PDC_cursor_off();
-	else
-		PDC_cursor_on();
+	curs_set(bf);
 
 	return OK;
 }