diff --git a/glabels/SelectProductDialog.cpp b/glabels/SelectProductDialog.cpp
index 40918a3..2a406a6 100644
--- a/glabels/SelectProductDialog.cpp
+++ b/glabels/SelectProductDialog.cpp
@@ -56,6 +56,7 @@ namespace glabels
 			check->setChecked( mCategoryIdList.contains( category->id() ) );
 			categoriesLayout->addWidget( check );
 
+			mCheckList.append( check );
 			mCheckToCategoryMap[check] = category->id();
 
 			connect( check, SIGNAL(clicked()), this, SLOT(onCategoryCheckClicked()) );
@@ -231,7 +232,7 @@ namespace glabels
 	{
 		mCategoryIdList.clear();
 
-		foreach( QCheckBox* check, mCheckToCategoryMap.keys() )
+		foreach( QCheckBox* check, mCheckList )
 		{
 			if ( check->isChecked() )
 			{
diff --git a/glabels/SelectProductDialog.h b/glabels/SelectProductDialog.h
index 890f394..3806b30 100644
--- a/glabels/SelectProductDialog.h
+++ b/glabels/SelectProductDialog.h
@@ -86,6 +86,7 @@ namespace glabels
 		QBasicTimer mTimer;
 
 		QMap<QCheckBox*,QString> mCheckToCategoryMap;
+		QList<QCheckBox*>        mCheckList;
 		QStringList              mCategoryIdList;
 
 		bool mCanceled;