diff --git a/Desktop/components/JASP/Widgets/ColumnBasicInfo.qml b/Desktop/components/JASP/Widgets/ColumnBasicInfo.qml
index a8f6baf07c..2dd8b1f157 100644
--- a/Desktop/components/JASP/Widgets/ColumnBasicInfo.qml
+++ b/Desktop/components/JASP/Widgets/ColumnBasicInfo.qml
@@ -34,21 +34,21 @@ Item
 	property alias columnComputedTypeValue:	computedTypeVariableWindow.value
 	property alias columnTypeValue:			columnTypeVariableWindow.value
 
+	function focusOnTheNamePlease()
+	{
+		if (visible && columnModel.isVirtual)
+			columnNameVariablesWindow.forceActiveFocus()
+	}
+	
 	Connections
 	{
 		target: columnModel
-		function onVisibleChanged()
-		{
-			if (visible && columnModel.isVirtual)
-				columnNameVariablesWindow.forceActiveFocus()
-		}
-
-		function onChosenColumnChanged()
-		{
-			if (visible && columnModel.isVirtual)
-				columnNameVariablesWindow.forceActiveFocus()
-		}
+		function onVisibleChanged()			{ focusOnTheNamePlease(); }
+		function onChosenColumnChanged()	{ focusOnTheNamePlease(); }
+		function onIsVirtualChanged()		{ focusOnTheNamePlease(); }
 	}
+	
+
 
 	Column
 	{
diff --git a/Desktop/components/JASP/Widgets/ComputeColumnWindow.qml b/Desktop/components/JASP/Widgets/ComputeColumnWindow.qml
index 8149b97dbc..300a5379fe 100644
--- a/Desktop/components/JASP/Widgets/ComputeColumnWindow.qml
+++ b/Desktop/components/JASP/Widgets/ComputeColumnWindow.qml
@@ -45,6 +45,7 @@ FocusScope
 			computedColumnsInterface.sendCode(computeColumnEdit.text)
 		else
 		{
+			computedColumnConstructor.forceActiveFocus();
 			computedColumnConstructor.checkAndApplyFilter()
 			computedColumnsInterface.sendCode(computedColumnConstructor.rCode, computedColumnConstructor.jsonConstructed)
 		}
@@ -52,11 +53,10 @@ FocusScope
 
 	function askIfChangedOrClose()
 	{
-		if(computedColumnContainer.changed)	saveDialog.open()
+		if(computedColumnContainer.changed)	
+			saveDialog.open()
 	}
 
-
-
 	Item
 	{
 		id:				minWidthCollector
diff --git a/Desktop/components/JASP/Widgets/FilterConstructor/ComputedColumnsConstructor.qml b/Desktop/components/JASP/Widgets/FilterConstructor/ComputedColumnsConstructor.qml
index 58f3cd810f..d5144a9b06 100644
--- a/Desktop/components/JASP/Widgets/FilterConstructor/ComputedColumnsConstructor.qml
+++ b/Desktop/components/JASP/Widgets/FilterConstructor/ComputedColumnsConstructor.qml
@@ -34,7 +34,6 @@ FocusScope
 
 	function checkAndApplyFilter()
 	{
-		forceActiveFocus();
 		filterConstructor.somethingChanged = false
 
 		var allCorrect		= true