diff --git a/src/apps/callflows/app.js b/src/apps/callflows/app.js
index 0c42eb0..0e18cac 100644
--- a/src/apps/callflows/app.js
+++ b/src/apps/callflows/app.js
@@ -73,6 +73,49 @@ define(function(require){
 				app: self,
 				callback: callback
 			});
+
+			self.initHandlebarsHelpers();
+		},
+
+		initHandlebarsHelpers: function() {
+			Handlebars.registerHelper('compare', function (lvalue, operator, rvalue, options) {
+				var operators, result;
+
+				if (arguments.length < 3) {
+					throw new Error('Handlerbars Helper \'compare\' needs 2 parameters');
+				}
+
+				if (options === undefined) {
+					options = rvalue;
+					rvalue = operator;
+					operator = '===';
+				}
+
+				operators = {
+					'==': function (l, r) { return l == r; },
+					'===': function (l, r) { return l === r; },
+					'!=': function (l, r) { return l != r; },
+					'!==': function (l, r) { return l !== r; },
+					'<': function (l, r) { return l < r; },
+					'>': function (l, r) { return l > r; },
+					'<=': function (l, r) { return l <= r; },
+					'>=': function (l, r) { return l >= r; },
+					'typeof': function (l, r) { return typeof l == r; }
+				};
+
+				if (!operators[operator]) {
+					throw new Error('Handlerbars Helper \'compare\' doesn\'t know the operator ' + operator);
+				}
+
+				result = operators[operator](lvalue, rvalue);
+
+				if (result) {
+					return options.fn(this);
+				} else {
+					return options.inverse(this);
+				}
+
+			});
 		},
 
 		// Entry Point of the app
@@ -240,7 +283,6 @@ define(function(require){
 				template = args.template,
 				actions = args.actions,
 				editEntity = function(type, id) {
-
 					monster.pub(actions[type].editEntity, {
 						data: id ? { id: id } : {},
 						parent: template,
@@ -254,7 +296,8 @@ define(function(require){
 								self.refreshEntityList({
 									template: template,
 									actions: actions,
-									entityType: type
+									entityType: type,
+									activeEntityId: data.id
 								});
 								editEntity(type, data.id);
 							},
@@ -315,6 +358,7 @@ define(function(require){
 
 			template.find('.entity-edition .list-add').on('click', function() {
 				var type = template.find('.entity-edition .list-container .list').data('type');
+				$('.entity-edition .list-container .list-element-active').removeClass('list-element-active');
 				editEntity(type);
 			});
 
@@ -323,6 +367,9 @@ define(function(require){
 					id = $this.data('id'),
 					type = $this.parents('.list').data('type');
 
+				$this.closest('.list').find('.list-element-active').removeClass('list-element-active');
+				$this.addClass('list-element-active');
+
 				editEntity(type, id);
 			});
 
@@ -348,11 +395,15 @@ define(function(require){
 				template = args.template,
 				actions = args.actions,
 				entityType = args.entityType,
-				callback = args.callbacks;
+				callback = args.callbacks,
+				activeEntityId = args.activeEntityId || null;
 
 			actions[entityType].listEntities(function(entities) {
 				self.formatEntityData(entities, entityType);
-				var listEntities = $(monster.template(self, 'entity-list', { entities: entities }));
+				var listEntities = $(monster.template(self, 'entity-list', {
+					entities: entities,
+					activeEntityId: activeEntityId
+				}));
 
 				monster.ui.tooltips(listEntities);
 
diff --git a/src/apps/callflows/style/app.css b/src/apps/callflows/style/app.css
index 78325f4..0ca7dda 100644
--- a/src/apps/callflows/style/app.css
+++ b/src/apps/callflows/style/app.css
@@ -773,13 +773,13 @@
 }
 
 #callflow_container .left-bar-container .list-add:hover {
-	background: #22A5FF;
-	color: white;
+	background: #E3E3E3;
+	color: #303039;
 	cursor: pointer;
 }
 
 #callflow_container .left-bar-container .list-add:hover i {
-	color: white;
+	color: #303039;
 }
 
 #callflow_container .left-bar-container .list-loader {
@@ -794,6 +794,13 @@
 	border-bottom: solid 1px #ccc;
 }
 
+#callflow_container .left-bar-container .list-element.list-element-active > div,
+#callflow_container .left-bar-container .list-element.list-element-active > div:hover {
+	background: #22A5FF;
+	color: white;
+	cursor: default;
+}
+
 #callflow_container .left-bar-container .list-element > div {
 	background-color: #f6f6f6;
 	background-image: -webkit-linear-gradient(top, hsl(0, 0%, 98%) 0%, hsl(0, 0%, 95%) 100%);
diff --git a/src/apps/callflows/views/entity-list.html b/src/apps/callflows/views/entity-list.html
index a445a07..b454730 100644
--- a/src/apps/callflows/views/entity-list.html
+++ b/src/apps/callflows/views/entity-list.html
@@ -1,5 +1,5 @@
 {{#each entities}}
-	<li class="list-element" data-id="{{this.id}}" data-search="{{this.displayName}} {{this.id}}">
+	<li class="list-element {{#compare @root.activeEntityId '===' this.id}}list-element-active{{/compare}}" data-id="{{this.id}}" data-search="{{this.displayName}} {{this.id}}">
 		<div class="link">
 			{{#if customEntityTemplate}}
 				{{{customEntityTemplate}}}