diff --git a/apps/opencs/model/settings/usersettings.cpp b/apps/opencs/model/settings/usersettings.cpp
index 3e59d0582f..bcf7c3ba9c 100644
--- a/apps/opencs/model/settings/usersettings.cpp
+++ b/apps/opencs/model/settings/usersettings.cpp
@@ -356,6 +356,14 @@ void CSMSettings::UserSettings::buildSettingModelDefaults()
         formatId->setToolTip ("(Default: Blue) Use one of the following formats:" + tooltip);
     }
 
+    declareSection ("general-input", "General Input");
+    {
+        Setting *cycle = createSetting (Type_CheckBox, "cycle", "Cyclic next/previous");
+        cycle->setDefaultValue ("false");
+        cycle->setToolTip ("When using next/previous functions at the last/first item of a "
+            "list go to the first/last item");
+    }
+    
     {
         /******************************************************************
         * There are three types of values:
diff --git a/apps/opencs/view/world/recordbuttonbar.cpp b/apps/opencs/view/world/recordbuttonbar.cpp
index db23203415..5dcc1d5cd0 100644
--- a/apps/opencs/view/world/recordbuttonbar.cpp
+++ b/apps/opencs/view/world/recordbuttonbar.cpp
@@ -7,6 +7,8 @@
 #include "../../model/world/idtable.hpp"
 #include "../../model/world/commanddispatcher.hpp"
 
+#include "../../model/settings/usersettings.hpp"
+
 #include "../world/tablebottombox.hpp"
 
 void CSVWorld::RecordButtonBar::updateModificationButtons()
@@ -132,12 +134,16 @@ void CSVWorld::RecordButtonBar::cloneRequest()
 }
 
 void CSVWorld::RecordButtonBar::nextId()
-{
+{    
     int newRow = mTable.getModelIndex (mId.getId(), 0).row() + 1;
 
     if (newRow >= mTable.rowCount())
     {
-        return;
+        if (CSMSettings::UserSettings::instance().settingValue ("general-input/cycle")
+            =="true")
+            newRow = 0;
+        else
+            return;
     }    
     
     emit switchToRow (newRow);
@@ -149,7 +155,11 @@ void CSVWorld::RecordButtonBar::prevId()
 
     if (newRow < 0)
     {
-        return;
+        if (CSMSettings::UserSettings::instance().settingValue ("general-input/cycle")
+            =="true")
+            newRow = mTable.rowCount()-1;
+        else
+            return;
     }
     
     emit switchToRow (newRow);