diff --git a/x-pack/test/functional/apps/infra/logs_source_configuration.ts b/x-pack/test/functional/apps/infra/logs_source_configuration.ts
index 1dfbe3526ce40..ecad5a40ec42e 100644
--- a/x-pack/test/functional/apps/infra/logs_source_configuration.ts
+++ b/x-pack/test/functional/apps/infra/logs_source_configuration.ts
@@ -15,8 +15,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const pageObjects = getPageObjects(['common', 'infraLogs']);
   const retry = getService('retry');
 
-  // FLAKY: https://github.com/elastic/kibana/issues/58059
-  describe.skip('Logs Source Configuration', function() {
+  describe('Logs Source Configuration', function() {
     this.tags('smoke');
 
     before(async () => {
diff --git a/x-pack/test/functional/services/infra_source_configuration_form.ts b/x-pack/test/functional/services/infra_source_configuration_form.ts
index ab61d5232fa1c..dbae6f00f75a2 100644
--- a/x-pack/test/functional/services/infra_source_configuration_form.ts
+++ b/x-pack/test/functional/services/infra_source_configuration_form.ts
@@ -36,25 +36,37 @@ export function InfraSourceConfigurationFormProvider({ getService }: FtrProvider
       return await testSubjects.find('~addLogColumnPopover');
     },
     async addTimestampLogColumn() {
-      await (await this.getAddLogColumnButton()).click();
+      // try to open the popover
+      const popover = await retry.try(async () => {
+        await (await this.getAddLogColumnButton()).click();
+        return this.getAddLogColumnPopover();
+      });
+
+      // try to select the timestamp field
       await retry.try(async () => {
-        await (
-          await testSubjects.findDescendant(
-            '~addTimestampLogColumn',
-            await this.getAddLogColumnPopover()
-          )
-        ).click();
+        await (await testSubjects.findDescendant('~addTimestampLogColumn', popover)).click();
       });
+
+      // wait for timestamp panel to show up
+      await testSubjects.findDescendant('~systemLogColumnPanel:Timestamp', await this.getForm());
     },
     async addFieldLogColumn(fieldName: string) {
-      await (await this.getAddLogColumnButton()).click();
+      // try to open the popover
+      const popover = await retry.try(async () => {
+        await (await this.getAddLogColumnButton()).click();
+        return this.getAddLogColumnPopover();
+      });
+
+      // try to select the given field
       await retry.try(async () => {
-        const popover = await this.getAddLogColumnPopover();
         await (await testSubjects.findDescendant('~fieldSearchInput', popover)).type(fieldName);
         await (
           await testSubjects.findDescendant(`~addFieldLogColumn:${fieldName}`, popover)
         ).click();
       });
+
+      // wait for field panel to show up
+      await testSubjects.findDescendant(`~fieldLogColumnPanel:${fieldName}`, await this.getForm());
     },
     async getLogColumnPanels(): Promise<WebElementWrapper[]> {
       return await testSubjects.findAllDescendant('~logColumnPanel', await this.getForm());