diff --git a/exec/noyesbar.src b/exec/noyesbar.src
index 4c76d5417410d4754c78a576685955b5cbe77b60..2f07acd4e0ed5b1401ad918ac114c3d382515d88 100644
--- a/exec/noyesbar.src
+++ b/exec/noyesbar.src
@@ -6,11 +6,18 @@
 
 # @format.tab-size 8, @format.use-tabs true
 
+!include sbbsdefs.inc # _question
+
 str tmp
 
 copy tmp str
 setstr "N"
-print "
n
b
h@QUESTION@? "
+compare_strn 2 _question "\r\n"
+if_true
+	crlf
+	shift_str _question 2
+	end_if
+printf "
n
b
h[
wû
b] 
y%s? " _question
 :top
 compare_str "N"
 if_equal
diff --git a/exec/yesnobar.src b/exec/yesnobar.src
index 0267116d128dd0c9dac03d3f861465bc7f184566..e1addede5175fd320fc7d29db03818074d9d2ae7 100644
--- a/exec/yesnobar.src
+++ b/exec/yesnobar.src
@@ -6,11 +6,18 @@
 
 # @format.tab-size 8, @format.use-tabs true
 
+!include sbbsdefs.inc # _question
+
 str tmp
 
 copy tmp str
 setstr "Y"
-print "
n
b
h@QUESTION@? "
+compare_strn 2 _question "\r\n"
+if_true
+	crlf
+	shift_str _question 2
+	end_if
+printf "
n
b
h[
wû
b] 
y%s? " _question
 :top
 compare_str "Y"
 if_equal