diff --git a/sources/ui/conductorpropertieswidget.cpp b/sources/ui/conductorpropertieswidget.cpp
index 31226e055..4f0f0a19b 100644
--- a/sources/ui/conductorpropertieswidget.cpp
+++ b/sources/ui/conductorpropertieswidget.cpp
@@ -29,36 +29,14 @@
 ConductorPropertiesWidget::ConductorPropertiesWidget(QWidget *parent) :
 	QWidget(parent),
 	ui(new Ui::ConductorPropertiesWidget),
-	m_first_activation (true)
+	m_activation (true)
 {
 	ui->setupUi(this);
 	initWidget();
 }
 
-/**
- * @brief ConductorPropertiesWidget::event
- * @param event
- * @return
- */
-bool ConductorPropertiesWidget::event(QEvent *event)
-{
-	if (m_first_activation)
-	{
-			if (event -> type() == QEvent::WindowActivate || event -> type() == QEvent::Show)
-			{
-					QTimer::singleShot(10, this, SLOT(firstActivated()));
-					m_first_activation = true;
-			}
-	}
-	return(QWidget::event(event));
-}
 
-/**
- * @brief ConductorPropertiesWidget::firstActivated
- */
-void ConductorPropertiesWidget::firstActivated() {
-	ui -> m_text_le -> setFocus();
-}
+
 
 /**
  * @brief ConductorPropertiesWidget::ConductorPropertiesWidget
@@ -140,6 +118,24 @@ ConductorProperties ConductorPropertiesWidget::properties() const {
 	return properties_;
 }
 
+/**
+ * @brief ConductorPropertiesWidget::event
+ * @param event
+ * @return
+ */
+bool ConductorPropertiesWidget::event(QEvent *event)
+{
+	if (m_activation)
+	{
+			if (event -> type() == QEvent::WindowActivate || event -> type() == QEvent::Show)
+			{
+					ui -> m_text_le -> setFocus();
+			}
+	}
+	return(QWidget::event(event));
+}
+
+
 /**
  * @brief ConductorPropertiesWidget::setReadOnly
  * @param ro if true this widget is disabled
diff --git a/sources/ui/conductorpropertieswidget.h b/sources/ui/conductorpropertieswidget.h
index b45b3592c..1e715666c 100644
--- a/sources/ui/conductorpropertieswidget.h
+++ b/sources/ui/conductorpropertieswidget.h
@@ -48,6 +48,8 @@ class ConductorPropertiesWidget : public QWidget
 		void initWidget();
 		void setConductorType(ConductorProperties::ConductorType type);
 
+	protected:
+		virtual bool event(QEvent *event);
 
 	//SLOTS
 	public slots:
@@ -59,14 +61,12 @@ class ConductorPropertiesWidget : public QWidget
 		void on_m_color_pb_clicked();
 		void setColorButton (const QColor &color);
 		void on_m_update_preview_pb_clicked();
-		void firstActivated();
-		virtual bool event(QEvent *event);
 
 	private:
 		Ui::ConductorPropertiesWidget *ui;
 		ConductorProperties m_properties;
 		QTextOrientationSpinBoxWidget *m_verti_select, *m_horiz_select;
-		bool m_first_activation;
+		bool m_activation;
 };
 
 #endif // CONDUCTORPROPERTIESWIDGET_H