diff --git a/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidSimpleNameReferenceExtension.kt b/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidSimpleNameReferenceExtension.kt
index e15d34a1669..bb9fb4081a4 100644
--- a/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidSimpleNameReferenceExtension.kt
+++ b/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidSimpleNameReferenceExtension.kt
@@ -48,10 +48,7 @@ class AndroidSimpleNameReferenceExtension : SimpleNameReferenceExtension {
             return psiFactory.createNameIdentifier(newSyntheticPropertyName.name)
         }
         else if (isLayoutPackageIdentifier(reference)) {
-            return if (newElementName.endsWith(".xml"))
-                psiFactory.createSimpleName(newElementName.dropLast(".xml".length)).getIdentifier()
-            else
-                reference.element.getIdentifier()
+            return psiFactory.createSimpleName(newElementName.substringBeforeLast(".xml")).getIdentifier()
         }
 
         return null