diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/list_zones_widget.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/list_zones_widget.cpp
index d0bfe058c..554b19ca3 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/list_zones_widget.cpp
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/list_zones_widget.cpp
@@ -122,9 +122,12 @@ QString ListZonesWidget::currentZoneName()
 	else if (m_ui.zoneSelectComboBox->currentIndex() == 2)
 	{
 		// Full cycle
-		zoneName = m_listSelection[m_zoneNameCycle];
-		m_zoneNameCycle++;
-		m_zoneNameCycle = m_zoneNameCycle % m_listSelection.size();
+		if (m_listSelection.size() > 0)
+		{
+			zoneName = m_listSelection[m_zoneNameCycle];
+			m_zoneNameCycle++;
+			m_zoneNameCycle = m_zoneNameCycle % m_listSelection.size();
+		}
 	}
 	return zoneName;
 }
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/list_zones_widget.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/list_zones_widget.h
index 4128f8cc2..7298bbe3c 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/list_zones_widget.h
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/list_zones_widget.h
@@ -44,14 +44,22 @@ public:
 	~ListZonesWidget();
 
 	void updateUi();
+
+	// Set zone builder, call this method before using this class
 	void setZoneBuilder(ZoneBuilder *zoneBuilder);
+
+	// Get current zone name which user selected from list.
 	QString currentZoneName();
+
+	// Get current rotation value which user selected (Rot 0-0deg, 1-90deg, 2-180deg, 3-270deg).
 	int currentRot();
+
+	// Get current flip value which user selected (Flip 0-false, 1-true).
 	int currentFlip();
+
 	bool isNotPropogate() const;
 	bool isForce() const;
 
-Q_SIGNALS:
 private Q_SLOTS:
 	void updateFilters_1(const QString &value);
 	void updateFilters_2(const QString &value);