diff --git a/app.js b/app.js
index 3464638..dd3e8f0 100644
--- a/app.js
+++ b/app.js
@@ -816,7 +816,10 @@ var app = {
 
 		$container.find('.js-open-cc-settings').on('click', function(e) {
 			e.preventDefault();
-			self.settingsRender($container);
+			self.settingsRender($container, function(){
+				// Open first queue
+				$('#queues-list li:first-child a').click();
+			});
 		});
 	},
 
@@ -862,13 +865,8 @@ var app = {
 		var self = this;
 		var html = $(monster.template(self, 'settings', {}));
 		$container.empty().append(html);
-		self.settingsInit($container, callback);
-		self.initHeaderSubmenu();
-	},
-
-	settingsInit: function($container, callback) {
-		var self = this;
 		var $queuesListBox = $container.find('#queues-list-container');
+
 		self.settingsQueuesListRender(null, $queuesListBox, function() {
 			monster.ui.tooltips($container, {
 				options: {
@@ -879,13 +877,12 @@ var app = {
 
 			self.settingsBindEvents($container);
 
-			$('#queues-list li:first-child a').click();
-
 			if(typeof(callback) === 'function') {
 				callback();
 			}
 		});
 
+		self.initHeaderSubmenu();
 	},
 
 	settingsBindEvents: function($container) {
@@ -1530,7 +1527,7 @@ var app = {
 		var self = this;
 
 		// list of queues
-		$('.list_queues_inner > li', container).on('click', function(e) {
+		$('.js-queues-list > li', container).on('click', function(e) {
 			var $queueEl = $(this);
 
 			self.vars.queue_id = $queueEl.attr('id');
@@ -1560,8 +1557,18 @@ var app = {
 			self.showEavesdropPopup('call', data);
 		});
 
+		$('.js-queues-list .js-edit-queue', container).on('click', function(e) {
+			e.preventDefault();
+			e.stopPropagation();
+
+			var queueId = $(this).closest('li').attr('id');
+			self.settingsRender($('#monster_content'), function(){
+				$('#queues-list li').filter('[data-id="' + queueId + '"]').addClass('active');
+				self.settingsQueueEditFormRender(queueId, function(){})
+			});
+		});
 
-		$('.list_queues li .js-eavesdrop', container).on('click', function(e) {
+		$('.js-queues-list li .js-eavesdrop', container).on('click', function(e) {
 			e.preventDefault();
 			e.stopPropagation();
 
diff --git a/views/queues_dashboard.html b/views/queues_dashboard.html
index b91e42d..caa1a6f 100644
--- a/views/queues_dashboard.html
+++ b/views/queues_dashboard.html
@@ -1,6 +1,6 @@
 <div>
 	<div class="list_queues">
-		<ul class="list_queues_inner">
+		<ul class="js-queues-list list_queues_inner">
 			{{#each queues}}
 				<li id="{{id}}" data-current_calls="{{current_calls}}" data-total_calls="{{total_calls}}">
 					<div class="box_title">
@@ -8,7 +8,7 @@
 							<i class="fa fa-headphones"></i>
 						</a>
 						<span class="box_title_text">{{name}}</span>
-						<a class="btn js-edit-queue edit_queue wrench_screw" style="display: none;" rel="popover" data-content="{{clicking_here_will_send_you}}">
+						<a title="{{ ../i18n.callcenter.settings.editQueueTitle }}" class="btn js-edit-queue edit_queue wrench_screw" style="display: none;" rel="popover" data-content="{{clicking_here_will_send_you}}">
 							<i class="fa fa-cog"></i>
 						</a>
 					</div>