diff --git a/Source/Fractorium/FractoriumPalette.cpp b/Source/Fractorium/FractoriumPalette.cpp
index d937ce7..ac5b120 100644
--- a/Source/Fractorium/FractoriumPalette.cpp
+++ b/Source/Fractorium/FractoriumPalette.cpp
@@ -274,9 +274,9 @@ void Fractorium::OnPaletteCellDoubleClicked(int row, int col)
 void Fractorium::OnPaletteRandomSelectButtonClicked(bool checked)
 {
 	uint i = 0;
-	int rowCount = ui.PaletteListTable->rowCount() - 1;
+	int rowCount = ui.PaletteListTable->rowCount();
 
-	while ((i = QTIsaac<ISAAC_SIZE, ISAAC_INT>::LockedRand(rowCount)) == uint(m_PreviousPaletteRow));
+	while (((i = QTIsaac<ISAAC_SIZE, ISAAC_INT>::LockedRand(rowCount)) == uint(m_PreviousPaletteRow)) || i >= uint(rowCount));
 
 	if (checked)
 		OnPaletteCellDoubleClicked(i, 1);//Will clear the adjustments.
diff --git a/Source/Fractorium/PaletteEditor/PaletteEditor.cpp b/Source/Fractorium/PaletteEditor/PaletteEditor.cpp
index 673d8ed..43c9dd0 100644
--- a/Source/Fractorium/PaletteEditor/PaletteEditor.cpp
+++ b/Source/Fractorium/PaletteEditor/PaletteEditor.cpp
@@ -567,8 +567,8 @@ map<float, GradientArrow> PaletteEditor::GetRandomColorsFromImage(QString filena
 
 	for (int i = 0; i < numPoints; i++)
 	{
-		int x = QTIsaac<ISAAC_SIZE, ISAAC_INT>::LockedRand() % image.width();
-		int y = QTIsaac<ISAAC_SIZE, ISAAC_INT>::LockedRand() % image.height();
+		int x = QTIsaac<ISAAC_SIZE, ISAAC_INT>::LockedRand(image.width());
+		int y = QTIsaac<ISAAC_SIZE, ISAAC_INT>::LockedRand(image.height());
 		QRgb rgb = image.pixel(x, y);
 		GradientArrow arrow;
 		arrow.Color(QColor::fromRgb(rgb));