diff --git a/kfind/kfinddlg.cpp b/kfind/kfinddlg.cpp
index 3277e6984d..8af5043816 100644
--- a/kfind/kfinddlg.cpp
+++ b/kfind/kfinddlg.cpp
@@ -79,8 +79,10 @@ KfindDlg::KfindDlg(const KUrl & url, QWidget *parent)
   vBox->addWidget(win, 1);
   vBox->addWidget(mStatusBar, 0);
 
-  connect(this, SIGNAL(user3Clicked()),
-	  this, SLOT(startSearch()));
+  connect(tabWidget, SIGNAL(startSearch()),
+          this, SLOT(startSearch()));
+  //connect(this, SIGNAL(user3Clicked()),
+  //        this, SLOT(startSearch()));
   connect(this, SIGNAL(user2Clicked()),
 	  this, SLOT(stopSearch()));
   connect(this, SIGNAL(user1Clicked()),
diff --git a/kfind/kftabdlg.cpp b/kfind/kftabdlg.cpp
index 56cc6441e0..a5e246e61d 100644
--- a/kfind/kftabdlg.cpp
+++ b/kfind/kftabdlg.cpp
@@ -166,9 +166,12 @@ KfindTabWidget::KfindTabWidget(QWidget *parent)
     connect( browseB, SIGNAL(clicked()),
              this, SLOT(getDirectory()) );
 
-    connect( nameBox, SIGNAL(activated(int)),
+    connect( nameBox, SIGNAL(returnPressed()),
              this, SIGNAL(startSearch()));
 
+    connect( dirBox, SIGNAL(returnPressed()),
+             this, SIGNAL(startSearch()));
+    
     // ************ Page Two
 
     pages[1] = new QWidget;