diff --git a/plugins/terminal/lib/jediterm-pty-2.1.jar b/plugins/terminal/lib/jediterm-pty-2.1.jar
index 966465cf0af2..4a5c8b3f41d9 100644
Binary files a/plugins/terminal/lib/jediterm-pty-2.1.jar and b/plugins/terminal/lib/jediterm-pty-2.1.jar differ
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminalWidget.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminalWidget.java
index e4276dc3fdbf..ff96ce4d69fb 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminalWidget.java
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminalWidget.java
@@ -3,6 +3,7 @@ package org.jetbrains.plugins.terminal;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.wm.impl.IdeBackgroundUtil;
+import com.intellij.ui.SearchTextField;
 import com.intellij.ui.components.JBScrollBar;
 import com.jediterm.terminal.TerminalStarter;
 import com.jediterm.terminal.TtyConnector;
@@ -14,7 +15,9 @@ import com.jediterm.terminal.ui.settings.SettingsProvider;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
+import javax.swing.event.DocumentListener;
 import java.awt.*;
+import java.awt.event.KeyListener;
 
 public class JBTerminalWidget extends JediTermWidget implements Disposable{
 
@@ -53,4 +56,31 @@ public class JBTerminalWidget extends JediTermWidget implements Disposable{
   @Override
   public void dispose() {
   }
+
+  @Override
+  protected SearchComponent createSearchComponent() {
+    return new SearchComponent() {
+      private final SearchTextField myTextField = new SearchTextField(false);
+      @Override
+      public String getText() {
+        return myTextField.getText();
+      }
+
+      @Override
+      public JComponent getComponent() {
+        myTextField.setOpaque(false);
+        return myTextField;
+      }
+
+      @Override
+      public void addDocumentChangeListener(DocumentListener listener) {
+        myTextField.addDocumentListener(listener);
+      }
+
+      @Override
+      public void addKeyListener(KeyListener listener) {
+        myTextField.addKeyboardListener(listener);
+      }
+    };
+  }
 }