diff --git a/kcmkwin/kwindesktop/main.cpp b/kcmkwin/kwindesktop/main.cpp
index 7343f6de35..f8e784db85 100644
--- a/kcmkwin/kwindesktop/main.cpp
+++ b/kcmkwin/kwindesktop/main.cpp
@@ -178,6 +178,7 @@ void KWinDesktopConfig::init()
     connect( m_ui->popupInfoCheckBox, SIGNAL(toggled(bool)), SLOT(changed()));
     connect( m_ui->popupHideSpinBox, SIGNAL(valueChanged(int)), SLOT(changed()));
     connect( m_ui->desktopLayoutIndicatorCheckBox, SIGNAL(stateChanged(int)), SLOT(changed()));
+    connect( m_ui->wrapAroundBox, SIGNAL(stateChanged(int)), SLOT(changed()));
     connect( m_editor, SIGNAL(keyChange()), SLOT(changed()));
     connect( m_ui->allShortcutsCheckBox, SIGNAL(stateChanged(int)), SLOT(slotShowAllShortcuts()));
     connect( m_ui->effectComboBox, SIGNAL(currentIndexChanged(int)), SLOT(changed()));
@@ -244,6 +245,8 @@ void KWinDesktopConfig::defaults()
 
     m_ui->effectComboBox->setCurrentIndex( 1 );
 
+    m_ui->wrapAroundBox->setChecked( true );
+
     m_editor->allDefault();
 
     emit changed(true);
@@ -273,6 +276,10 @@ void KWinDesktopConfig::load()
     m_ui->popupHideSpinBox->setValue( popupInfo.readEntry( "PopupHideDelay", 1000 ));
     m_ui->desktopLayoutIndicatorCheckBox->setChecked( !popupInfo.readEntry( "TextOnly", false) );
 
+    // Wrap Around on screen edge
+    KConfigGroup windowConfig( m_config, "Windows" );
+    m_ui->wrapAroundBox->setChecked( windowConfig.readEntry<bool>( "RollOverDesktops", true ) );
+
     // Effect for desktop switching
     // Set current option to "none" if no plugin is activated.
     KConfigGroup effectconfig( m_config, "Plugins" );
@@ -326,6 +333,10 @@ void KWinDesktopConfig::save()
     popupInfo.writeEntry( "PopupHideDelay", m_ui->popupHideSpinBox->value() );
     popupInfo.writeEntry( "TextOnly", !m_ui->desktopLayoutIndicatorCheckBox->isChecked() );
 
+    // Wrap Around on screen edge
+    KConfigGroup windowConfig( m_config, "Windows" );
+    windowConfig.writeEntry( "RollOverDesktops", m_ui->wrapAroundBox->isChecked() );
+
     // Effect desktop switching
     KConfigGroup effectconfig( m_config, "Plugins" );
     int desktopSwitcher = m_ui->effectComboBox->currentIndex();
diff --git a/kcmkwin/kwindesktop/main.ui b/kcmkwin/kwindesktop/main.ui
index 262e69efe2..9f502d7671 100644
--- a/kcmkwin/kwindesktop/main.ui
+++ b/kcmkwin/kwindesktop/main.ui
@@ -131,6 +131,16 @@
        <string>Switching</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_4">
+       <item>
+        <widget class="QCheckBox" name="wrapAroundBox">
+         <property name="whatsThis">
+          <string>Enable this option if you want keyboard or active desktop border navigation beyond the edge of a desktop to take you to the opposite edge of the new desktop.</string>
+         </property>
+         <property name="text">
+          <string>Desktop navigation wraps around</string>
+         </property>
+        </widget>
+       </item>
        <item>
         <widget class="QGroupBox" name="groupBox_3">
          <property name="title">