diff --git a/src/js/core/row/Row.js b/src/js/core/row/Row.js
index f1d09bff3..71ddb3aee 100644
--- a/src/js/core/row/Row.js
+++ b/src/js/core/row/Row.js
@@ -437,6 +437,11 @@ export default class Row extends CoreFeature{
 		
 		this.element = false;
 		this.modules = {};
+
+		this.initialized = false;
+		this.heightInitialized = false;
+		this.component = null;
+		this.created = false;
 	}
 
 	isDisplayed(){
diff --git a/src/js/modules/SelectRow/SelectRow.js b/src/js/modules/SelectRow/SelectRow.js
index beb557a3d..9d5665c5c 100644
--- a/src/js/modules/SelectRow/SelectRow.js
+++ b/src/js/modules/SelectRow/SelectRow.js
@@ -204,7 +204,11 @@ export default class SelectRow extends Module{
 			this.lastClickedRow = row;
 		}else{
 			this.deselectRows(undefined, true);
-			this.selectRows(row);
+			if (this.selectedRows.length === 1 && this.isRowSelected(row)) {
+				// do nothing
+			} else {
+				this.selectRows(row);
+			}
 			this.lastClickedRow = row;
 		}
 	}