3 files changed, 7 insertions, 15 deletions
diff --git a/src/lineedit.cpp b/src/lineedit.cpp
index b691e090..fe8095ab 100644
--- a/src/lineedit.cpp
+++ b/src/lineedit.cpp
@@ -66,19 +66,6 @@ void LineEdit::keyPressEvent(QKeyEvent *event)
 }
 
 
-void LineEdit::contextMenuEvent(QContextMenuEvent *event)
-{
-    KLineEdit::contextMenuEvent(event);
-}
-
-
-void LineEdit::focusInEvent(QFocusEvent *event)
-{
-    selectAll();
-
-    KLineEdit::focusInEvent(event);
-}
-
 void LineEdit::mouseDoubleClickEvent(QMouseEvent *)
 {
     selectAll();
diff --git a/src/lineedit.h b/src/lineedit.h
index 40e8d6d4..67ded052 100644
--- a/src/lineedit.h
+++ b/src/lineedit.h
@@ -49,8 +49,6 @@ public:
 
 protected:
     virtual void keyPressEvent(QKeyEvent*);
-    virtual void contextMenuEvent(QContextMenuEvent*);
-    virtual void focusInEvent(QFocusEvent*);
     virtual void mouseDoubleClickEvent(QMouseEvent *);
 };
 
diff --git a/src/urlbar.cpp b/src/urlbar.cpp
index 5ad8314e..12691519 100644
--- a/src/urlbar.cpp
+++ b/src/urlbar.cpp
@@ -154,6 +154,13 @@ void UrlBar::setProgress(int progress)
 
 void UrlBar::slotUpdateUrl()
 {
+    // Don't change my typed url...
+    if(hasFocus())
+    {
+        kDebug() << "Don't change my typed url...";
+        return;
+    }
+    
     if (count())
     {
         changeUrl(0, Application::icon(m_currentUrl), m_currentUrl);