diff --git a/python/python-common-tests/com/jetbrains/python/PythonCommonCompletionTest.java b/python/python-common-tests/com/jetbrains/python/PythonCommonCompletionTest.java
index d07738d1aa11..836a380f74bc 100644
--- a/python/python-common-tests/com/jetbrains/python/PythonCommonCompletionTest.java
+++ b/python/python-common-tests/com/jetbrains/python/PythonCommonCompletionTest.java
@@ -2251,6 +2251,14 @@ public abstract class PythonCommonCompletionTest extends PythonCommonTestCase {
     });
   }
 
+  // PY-62203 PY-84778
+  public void testMatchingSymbolsAndModulesSuggestedTogether() {
+    myFixture.copyDirectoryToProject(getTestName(true), "");
+    myFixture.configureByFile("a.py");
+    myFixture.complete(CompletionType.BASIC, 1);
+    assertContainsElements(myFixture.getLookupElementStrings(), "dataclasses", "dataclass");
+  }
+
   private static void runWithImportableNamesInBasicCompletionDisabled(@NotNull Runnable action) {
     PyCodeInsightSettings settings = PyCodeInsightSettings.getInstance();
     boolean old = settings.INCLUDE_IMPORTABLE_NAMES_IN_BASIC_COMPLETION;
diff --git a/python/testData/completion/matchingSymbolsAndModulesSuggestedTogether/a.py b/python/testData/completion/matchingSymbolsAndModulesSuggestedTogether/a.py
new file mode 100644
index 000000000000..656ea64d23b1
--- /dev/null
+++ b/python/testData/completion/matchingSymbolsAndModulesSuggestedTogether/a.py
@@ -0,0 +1,3 @@
+@datacla<caret>
+class MyClass:
+    pass
\ No newline at end of file
diff --git a/python/testData/completion/matchingSymbolsAndModulesSuggestedTogether/dataclasses.py b/python/testData/completion/matchingSymbolsAndModulesSuggestedTogether/dataclasses.py
new file mode 100644
index 000000000000..70d6d389239f
--- /dev/null
+++ b/python/testData/completion/matchingSymbolsAndModulesSuggestedTogether/dataclasses.py
@@ -0,0 +1,2 @@
+def dataclass(cls):
+    return cls