1 files changed, 12 insertions, 6 deletions
diff --git a/src/list.rs b/src/list.rs
index 452907d..631c40d 100755
--- a/src/list.rs
+++ b/src/list.rs
@@ -18,18 +18,24 @@ impl<T> ContentList<T> {
         //     self.index += 1;
         // }
 
-        if self.index == self.list.len() - 1 {
-            self.index = 0;
-        } else {
-            self.index += 1;
+        let len = self.list.len();
+        if len != 0 {
+            if self.index == self.list.len() - 1 {
+                self.index = 0;
+            } else {
+                self.index += 1;
+            }
         }
     }
 
     /// Go to previous item in list
     pub fn prev(&mut self) {
         if self.index == 0 {
-            self.index = self.list.len() - 1;
-        } else  {
+            let len = self.list.len();
+            if len != 0 {
+                self.index = len - 1;
+            }
+        } else {
             self.index -= 1;
         }
     }