diff --git a/src/preferences/virtualmemory/SettingsWindow.cpp b/src/preferences/virtualmemory/SettingsWindow.cpp
index 504637667b..9b09f1da02 100644
--- a/src/preferences/virtualmemory/SettingsWindow.cpp
+++ b/src/preferences/virtualmemory/SettingsWindow.cpp
@@ -365,6 +365,12 @@ SettingsWindow::MessageReceived(BMessage* message)
 			}
 
 			fSettings.SetSwapEnabled(value != 0);
+			if (value == 1 && fSettings.SwapSize() == 0)
+			{
+				off_t min, max;
+				_GetSwapFileLimits(min, max);
+				fSettings.SetSwapSize(min);
+			}
 			_Update();
 			break;
 		}