diff --git a/apps/opencs/view/world/dialoguesubview.cpp b/apps/opencs/view/world/dialoguesubview.cpp
index 69255f8212..1d3eb53139 100644
--- a/apps/opencs/view/world/dialoguesubview.cpp
+++ b/apps/opencs/view/world/dialoguesubview.cpp
@@ -719,6 +719,12 @@ void CSVWorld::DialogueSubView::setEditLock (bool locked)
     mButtons->setEditLock (locked);
 }
 
+void CSVWorld::DialogueSubView::updateUserSetting (const QString& name, const QStringList& value)
+{
+    SimpleDialogueSubView::updateUserSetting (name, value);
+    mButtons->updateUserSetting (name, value);
+}
+
 void CSVWorld::DialogueSubView::showPreview ()
 {
     QModelIndex currentIndex (getTable().getModelIndex (getUniversalId().getId(), 0));
diff --git a/apps/opencs/view/world/dialoguesubview.hpp b/apps/opencs/view/world/dialoguesubview.hpp
index aec98d69c3..be58be5ade 100644
--- a/apps/opencs/view/world/dialoguesubview.hpp
+++ b/apps/opencs/view/world/dialoguesubview.hpp
@@ -228,6 +228,8 @@ namespace CSVWorld
 
             virtual void setEditLock (bool locked);
 
+            virtual void updateUserSetting (const QString& name, const QStringList& value);
+            
         private slots:
 
             void showPreview();
diff --git a/apps/opencs/view/world/recordbuttonbar.cpp b/apps/opencs/view/world/recordbuttonbar.cpp
index 5dcc1d5cd0..63c0dd0a18 100644
--- a/apps/opencs/view/world/recordbuttonbar.cpp
+++ b/apps/opencs/view/world/recordbuttonbar.cpp
@@ -25,6 +25,29 @@ void CSVWorld::RecordButtonBar::updateModificationButtons()
     mDeleteButton->setDisabled (commandDisabled);
 }
 
+void CSVWorld::RecordButtonBar::updatePrevNextButtons()
+{
+    int rows = mTable.rowCount();
+    
+    if (rows<=1)
+    {
+        mPrevButton->setDisabled (true);
+        mNextButton->setDisabled (true);
+    }
+    else if (CSMSettings::UserSettings::instance().settingValue ("general-input/cycle")=="true")
+    {
+        mPrevButton->setDisabled (false);
+        mNextButton->setDisabled (false);
+    }
+    else
+    {
+        int row = mTable.getModelIndex (mId.getId(), 0).row();
+
+        mPrevButton->setDisabled (row<=0);
+        mNextButton->setDisabled (row>=rows-1);
+    }
+}
+
 CSVWorld::RecordButtonBar::RecordButtonBar (const CSMWorld::UniversalId& id,
     CSMWorld::IdTable& table, TableBottomBox *bottomBox,
     CSMWorld::CommandDispatcher *commandDispatcher, QWidget *parent)
@@ -35,15 +58,15 @@ CSVWorld::RecordButtonBar::RecordButtonBar (const CSMWorld::UniversalId& id,
     buttonsLayout->setContentsMargins (0, 0, 0, 0);
 
     // left section
-    QToolButton* prevButton = new QToolButton (this);
-    prevButton->setIcon(QIcon(":/go-previous.png"));
-    prevButton->setToolTip ("Switch to previous record");
-    buttonsLayout->addWidget (prevButton, 0);
+    mPrevButton = new QToolButton (this);
+    mPrevButton->setIcon(QIcon(":/go-previous.png"));
+    mPrevButton->setToolTip ("Switch to previous record");
+    buttonsLayout->addWidget (mPrevButton, 0);
     
-    QToolButton* nextButton = new QToolButton (this);
-    nextButton->setIcon(QIcon(":/go-next.png"));
-    nextButton->setToolTip ("Switch to next record");
-    buttonsLayout->addWidget (nextButton, 1);
+    mNextButton = new QToolButton (this);
+    mNextButton->setIcon(QIcon(":/go-next.png"));
+    mNextButton->setToolTip ("Switch to next record");
+    buttonsLayout->addWidget (mNextButton, 1);
     
     buttonsLayout->addStretch(2);
 
@@ -96,8 +119,8 @@ CSVWorld::RecordButtonBar::RecordButtonBar (const CSMWorld::UniversalId& id,
         connect (mCloneButton, SIGNAL (clicked()), this, SLOT (cloneRequest()));
     }
 
-    connect (nextButton, SIGNAL (clicked()), this, SLOT (nextId()));
-    connect (prevButton, SIGNAL (clicked()), this, SLOT (prevId()));
+    connect (mNextButton, SIGNAL (clicked()), this, SLOT (nextId()));
+    connect (mPrevButton, SIGNAL (clicked()), this, SLOT (prevId()));
 
     if (mCommandDispatcher)
     {
@@ -105,7 +128,13 @@ CSVWorld::RecordButtonBar::RecordButtonBar (const CSMWorld::UniversalId& id,
         connect (mDeleteButton, SIGNAL (clicked()), mCommandDispatcher, SLOT (executeDelete()));
     }
 
+    connect (&mTable, SIGNAL (rowsInserted (const QModelIndex&, int, int)),
+        this, SLOT (rowNumberChanged (const QModelIndex&, int, int)));
+    connect (&mTable, SIGNAL (rowsRemoved (const QModelIndex&, int, int)),
+        this, SLOT (rowNumberChanged (const QModelIndex&, int, int)));
+    
     updateModificationButtons();
+    updatePrevNextButtons();
 }
 
 void CSVWorld::RecordButtonBar::setEditLock (bool locked)
@@ -114,9 +143,16 @@ void CSVWorld::RecordButtonBar::setEditLock (bool locked)
     updateModificationButtons();
 }
 
+void CSVWorld::RecordButtonBar::updateUserSetting (const QString& name, const QStringList& value)
+{
+    if (name=="general-input/cycle")
+        updatePrevNextButtons();
+}
+
 void CSVWorld::RecordButtonBar::universalIdChanged (const CSMWorld::UniversalId& id)
 {
     mId = id;
+    updatePrevNextButtons();
 }
 
 void CSVWorld::RecordButtonBar::cloneRequest()
@@ -164,3 +200,8 @@ void CSVWorld::RecordButtonBar::prevId()
     
     emit switchToRow (newRow);
 }
+
+void CSVWorld::RecordButtonBar::rowNumberChanged (const QModelIndex& parent, int start, int end)
+{
+    updatePrevNextButtons();
+}
diff --git a/apps/opencs/view/world/recordbuttonbar.hpp b/apps/opencs/view/world/recordbuttonbar.hpp
index 6a5fadca57..93ca45518e 100644
--- a/apps/opencs/view/world/recordbuttonbar.hpp
+++ b/apps/opencs/view/world/recordbuttonbar.hpp
@@ -6,6 +6,7 @@
 #include "../../model/world/universalid.hpp"
 
 class QToolButton;
+class QModelIndex;
 
 namespace CSMWorld
 {
@@ -35,6 +36,8 @@ namespace CSVWorld
             CSMWorld::IdTable& mTable;
             TableBottomBox *mBottom;
             CSMWorld::CommandDispatcher *mCommandDispatcher;
+            QToolButton *mPrevButton;
+            QToolButton *mNextButton;
             QToolButton *mCloneButton;
             QToolButton *mAddButton;
             QToolButton *mDeleteButton;
@@ -44,6 +47,8 @@ namespace CSVWorld
         private:
 
             void updateModificationButtons();
+
+            void updatePrevNextButtons();
             
         public:
 
@@ -52,7 +57,9 @@ namespace CSVWorld
                 CSMWorld::CommandDispatcher *commandDispatcher = 0, QWidget *parent = 0);
 
             void setEditLock (bool locked);
-                
+
+            void updateUserSetting (const QString& name, const QStringList& value);
+            
         public slots:
 
             void universalIdChanged (const CSMWorld::UniversalId& id);
@@ -64,6 +71,8 @@ namespace CSVWorld
             void nextId();
 
             void prevId();
+
+            void rowNumberChanged (const QModelIndex& parent, int start, int end);
             
         signals: