diff --git a/part/archiveview.cpp b/part/archiveview.cpp
index 1a0387bc..71cef8f9 100644
--- a/part/archiveview.cpp
+++ b/part/archiveview.cpp
@@ -1,179 +1,179 @@
 /*
  * ark -- archiver for the KDE project
  *
  * Copyright (C) 2008-2009 Harald Hvaal <haraldhv (at@at) stud.ntnu.no>
  * Copyright (c) 2016 Vladyslav Batyrenko <mvlabat@gmail.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
 
 #include "archiveview.h"
 #include "ark_debug.h"
 
 #include <QHeaderView>
 #include <QMimeData>
 #include <QDragEnterEvent>
 #include <QDragMoveEvent>
 #include <QMouseEvent>
 #include <QLineEdit>
 
 ArchiveView::ArchiveView(QWidget *parent)
     : QTreeView(parent)
 {
     setSelectionMode(QAbstractItemView::ExtendedSelection);
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     setAlternatingRowColors(true);
     setAnimated(true);
     setAllColumnsShowFocus(true);
     setSortingEnabled(true);
     setDragEnabled(true);
     setDropIndicatorShown(true);
     // #368807: drops must be initially disabled, otherwise they will override the MainWindow's ones.
     // They will be enabled in Part::slotLoadingFinished().
     setDropsEnabled(false);
     header()->setSectionResizeMode(QHeaderView::ResizeToContents);
 }
 
 void ArchiveView::startDrag(Qt::DropActions supportedActions)
 {
     //only start the drag if it's over the filename column. this allows dragging selection in
     //tree/detail view
     if (currentIndex().column() != 0) {
         return;
     }
 
     QTreeView::startDrag(supportedActions);
 }
 
 void ArchiveView::expandIfSingleFolder()
 {
     if (model()->rowCount() == 1) {
         expandToDepth(0);
     }
 }
 
 void ArchiveView::setDropsEnabled(bool enabled)
 {
     setAcceptDrops(enabled);
     setDragDropMode(enabled ? QAbstractItemView::DragDrop : QAbstractItemView::DragOnly);
 }
 
 void ArchiveView::dragEnterEvent(QDragEnterEvent * event)
 {
     //TODO: if no model, trigger some mechanism to create one automatically!
     qCDebug(ARK) << event;
 
     if (event->source() == this) {
         //we don't support internal drops yet.
         return;
     }
 
     QTreeView::dragEnterEvent(event);
 }
 
 void ArchiveView::dropEvent(QDropEvent * event)
 {
     qCDebug(ARK) << event;
 
     if (event->source() == this) {
         //we don't support internal drops yet.
         return;
     }
 
     QTreeView::dropEvent(event);
 }
 
 void ArchiveView::dragMoveEvent(QDragMoveEvent * event)
 {
     qCDebug(ARK) << event;
 
     if (event->source() == this) {
         //we don't support internal drops yet.
         return;
     }
 
     QTreeView::dragMoveEvent(event);
     if (event->mimeData()->hasFormat(QStringLiteral("text/uri-list"))) {
         event->acceptProposedAction();
     }
 }
 
 bool ArchiveView::eventFilter(QObject *object, QEvent *event)
 {
     if (object == m_entryEditor && event->type() == QEvent::KeyPress) {
         QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
         if (keyEvent->key() == Qt::Key_Escape) {
             closeEntryEditor();
             return true;
         }
     }
     return false;
 }
 
 void ArchiveView::mouseReleaseEvent(QMouseEvent *event)
 {
     if (m_editorIndex.isValid()) {
         closeEntryEditor();
     } else {
         QTreeView::mouseReleaseEvent(event);
     }
 }
 
 void ArchiveView::keyPressEvent(QKeyEvent *event)
 {
     if (m_editorIndex.isValid()) {
         switch (event->key()) {
         case Qt::Key_Return:
         case Qt::Key_Enter: {
             QLineEdit* editor = static_cast<QLineEdit*>(indexWidget(m_editorIndex));
             emit entryChanged(editor->text());
             closeEntryEditor();
             break;
         }
         default:
             QTreeView::keyPressEvent(event);
         }
     } else {
         QTreeView::keyPressEvent(event);
     }
 }
 
 void ArchiveView::renameSelectedEntry()
 {
     QModelIndex currentIndex = selectionModel()->currentIndex();
     currentIndex = (currentIndex.parent().isValid())
-                   ? currentIndex.parent().child(currentIndex.row(), 0)
+                   ? currentIndex.parent().model()->index(currentIndex.row(), 0, currentIndex.parent())
                    : model()->index(currentIndex.row(), 0);
     openEntryEditor(currentIndex);
 }
 
 void ArchiveView::openEntryEditor(const QModelIndex &index)
 {
     m_editorIndex = index;
     openPersistentEditor(index);
     m_entryEditor = static_cast<QLineEdit*>(indexWidget(m_editorIndex));
     m_entryEditor->installEventFilter(this);
     m_entryEditor->setText(index.data().toString());
     m_entryEditor->setFocus(Qt::OtherFocusReason);
     m_entryEditor->selectAll();
 }
 
 void ArchiveView::closeEntryEditor()
 {
     m_entryEditor->removeEventFilter(this);
     closePersistentEditor(m_editorIndex);
     m_editorIndex = QModelIndex();
 }