diff --git a/src/edit.rs b/src/edit.rs
index 19c4e2906744f2fafeaeabfe709333c261159153..71cf81845f2c49e22c82ed708951d9a5f23a2e78 100644
--- a/src/edit.rs
+++ b/src/edit.rs
@@ -453,9 +453,9 @@ impl<'out, 'prompt> State<'out, 'prompt> {
         if history.is_empty() {
             return self.out.beep();
         }
-        if self.history_index == history.len() && dir == Direction::Forward {
-            return self.out.beep();
-        } else if self.history_index == 0 && dir == Direction::Reverse {
+        if self.history_index == history.len() && dir == Direction::Forward
+            || self.history_index == 0 && dir == Direction::Reverse
+        {
             return self.out.beep();
         }
         if dir == Direction::Reverse {
diff --git a/src/tty/mod.rs b/src/tty/mod.rs
index 1476be64ebb3e1abb8987d4c3f274f7f7a9a0c8e..e6c42dc500c293b0c8d53dabc57eae30165ce9d6 100644
--- a/src/tty/mod.rs
+++ b/src/tty/mod.rs
@@ -160,9 +160,9 @@ fn width(s: &str, esc_seq: &mut u8) -> usize {
         0
     } else if *esc_seq == 2 {
         if s == ";" || (s.as_bytes()[0] >= b'0' && s.as_bytes()[0] <= b'9') {
-        } else if s == "m" {
+        /*} else if s == "m" {
             // last
-            *esc_seq = 0;
+            *esc_seq = 0;*/
         } else {
             // not supported
             *esc_seq = 0;