diff --git a/src/filewidgets/kdiroperator.cpp b/src/filewidgets/kdiroperator.cpp
--- a/src/filewidgets/kdiroperator.cpp
+++ b/src/filewidgets/kdiroperator.cpp
@@ -2599,7 +2599,7 @@
         const int itemsInRow = qMax(1, viewPortWidth / minWidth);
         const int remainingWidth = viewPortWidth - (minWidth * itemsInRow);
         const int width = minWidth + (remainingWidth / itemsInRow);
-        
+
         const QSize itemSize(width, height);
 
         view->setGridSize(itemSize);
diff --git a/src/filewidgets/kfilewidget.cpp b/src/filewidgets/kfilewidget.cpp
--- a/src/filewidgets/kfilewidget.cpp
+++ b/src/filewidgets/kfilewidget.cpp
@@ -1154,6 +1154,7 @@
 
     locationEdit->lineEdit()->setModified(false);
     locationEdit->lineEdit()->selectAll();
+    locationEdit->setFocus();
 }
 
 void KFileWidgetPrivate::_k_fileSelected(const KFileItem &i)
@@ -1173,13 +1174,7 @@
         emit q->selectionChanged();
     }
 
-    // if we are saving, let another chance to the user before accepting the dialog (or trying to
-    // accept). This way the user can choose a file and add a "_2" for instance to the filename
-    if (operationMode == KFileWidget::Saving) {
-        locationEdit->setFocus();
-    } else {
-        q->slotOk();
-    }
+    q->slotOk();
 }
 
 // I know it's slow to always iterate thru the whole filelist