diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json
index 26b3a8495a..8be8751d68 100644
--- a/resources/definitions/ultimaker3.def.json
+++ b/resources/definitions/ultimaker3.def.json
@@ -154,7 +154,6 @@
         "travel_avoid_distance": { "value": "3" },
         "wall_0_inset": { "value": "0" },
         "wall_line_width_x": { "value": "round(line_width * 0.3 / 0.35, 2)" },
-        "wall_thickness": { "value": "1" },
-        "xy_offset": { "value": "-0.14", "comment": "This is a hack to compensate for oversized prints. CURA-2845" }
+        "wall_thickness": { "value": "1" }
     }
 }
diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml
index 3ee8630183..d7a0a87dbe 100644
--- a/resources/qml/Actions.qml
+++ b/resources/qml/Actions.qml
@@ -131,7 +131,11 @@ Item
         id: resetProfileAction;
         enabled: Cura.MachineManager.hasUserSettings
         text: catalog.i18nc("@action:inmenu menubar:profile","&Discard current settings");
-        onTriggered: Cura.ContainerManager.clearUserContainers();
+        onTriggered:
+        {
+            forceActiveFocus();
+            Cura.ContainerManager.clearUserContainers();
+        }
     }
 
     Action