diff --git a/jadx-gui/src/main/java/jadx/gui/treemodel/JField.java b/jadx-gui/src/main/java/jadx/gui/treemodel/JField.java
index 433ac6f20..8d84fc7ef 100644
--- a/jadx-gui/src/main/java/jadx/gui/treemodel/JField.java
+++ b/jadx-gui/src/main/java/jadx/gui/treemodel/JField.java
@@ -81,6 +81,16 @@ public class JField extends JNode {
 		return UiUtils.typeFormatHtml(field.getFullName(), field.getType());
 	}
 
+	@Override
+	public String makeDescString() {
+		return UiUtils.typeStr(field.getType()) + " " + field.getName();
+	}
+
+	@Override
+	public boolean hasDescString() {
+		return true;
+	}
+
 	@Override
 	public int hashCode() {
 		return field.hashCode();
diff --git a/jadx-gui/src/main/java/jadx/gui/treemodel/JMethod.java b/jadx-gui/src/main/java/jadx/gui/treemodel/JMethod.java
index ffe4e60d3..ec185b00f 100644
--- a/jadx-gui/src/main/java/jadx/gui/treemodel/JMethod.java
+++ b/jadx-gui/src/main/java/jadx/gui/treemodel/JMethod.java
@@ -111,6 +111,16 @@ public class JMethod extends JNode {
 		return UiUtils.typeFormatHtml(name, getReturnType());
 	}
 
+	@Override
+	public String makeDescString() {
+		return UiUtils.typeStr(getReturnType()) + " " + makeBaseString();
+	}
+
+	@Override
+	public boolean hasDescString() {
+		return true;
+	}
+
 	@Override
 	public int hashCode() {
 		return mth.hashCode();
diff --git a/jadx-gui/src/main/java/jadx/gui/treemodel/JNode.java b/jadx-gui/src/main/java/jadx/gui/treemodel/JNode.java
index 5d15a84fe..96b53ee37 100644
--- a/jadx-gui/src/main/java/jadx/gui/treemodel/JNode.java
+++ b/jadx-gui/src/main/java/jadx/gui/treemodel/JNode.java
@@ -94,7 +94,7 @@ public abstract class JNode extends DefaultMutableTreeNode {
 	}
 
 	public String makeLongStringHtml() {
-		return makeString();
+		return makeLongString();
 	}
 
 	@Override
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/UiUtils.java b/jadx-gui/src/main/java/jadx/gui/utils/UiUtils.java
index 5b62e6777..31194cbdb 100644
--- a/jadx-gui/src/main/java/jadx/gui/utils/UiUtils.java
+++ b/jadx-gui/src/main/java/jadx/gui/utils/UiUtils.java
@@ -1,6 +1,8 @@
 package jadx.gui.utils;
 
-import java.awt.*;
+import java.awt.Image;
+import java.awt.Toolkit;
+import java.awt.Window;
 import java.awt.datatransfer.Clipboard;
 import java.awt.datatransfer.StringSelection;
 import java.awt.datatransfer.Transferable;
@@ -9,7 +11,11 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.swing.*;
+import javax.swing.Action;
+import javax.swing.Icon;
+import javax.swing.ImageIcon;
+import javax.swing.JComponent;
+import javax.swing.KeyStroke;
 
 import org.intellij.lang.annotations.MagicConstant;
 import org.slf4j.Logger;
@@ -65,7 +71,7 @@ public class UiUtils {
 	}
 
 	public static String typeFormat(String name, ArgType type) {
-		return name + typeStr(type);
+		return name + " " + typeStr(type);
 	}
 
 	public static String typeFormatHtml(String name, ArgType type) {
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/search/TextSearchIndex.java b/jadx-gui/src/main/java/jadx/gui/utils/search/TextSearchIndex.java
index 1be31cc5f..8c8bce0b1 100644
--- a/jadx-gui/src/main/java/jadx/gui/utils/search/TextSearchIndex.java
+++ b/jadx-gui/src/main/java/jadx/gui/utils/search/TextSearchIndex.java
@@ -55,11 +55,11 @@ public class TextSearchIndex {
 		clsNamesIndex.put(cls.getFullName(), nodeCache.makeFrom(cls));
 		for (JavaMethod mth : cls.getMethods()) {
 			JNode mthNode = nodeCache.makeFrom(mth);
-			mthSignaturesIndex.put(mthNode.makeLongString(), mthNode);
+			mthSignaturesIndex.put(mthNode.makeDescString(), mthNode);
 		}
 		for (JavaField fld : cls.getFields()) {
 			JNode fldNode = nodeCache.makeFrom(fld);
-			fldSignaturesIndex.put(fldNode.makeLongString(), fldNode);
+			fldSignaturesIndex.put(fldNode.makeDescString(), fldNode);
 		}
 		for (JavaClass innerCls : cls.getInnerClasses()) {
 			indexNames(innerCls);