diff --git a/qrenderdoc/Code/Core.cpp b/qrenderdoc/Code/Core.cpp
index 50cd41286..1dc144d2c 100644
--- a/qrenderdoc/Code/Core.cpp
+++ b/qrenderdoc/Code/Core.cpp
@@ -5,6 +5,7 @@
 #include <QTimer>
 #include <QMessageBox>
 #include <QMetaObject>
+#include <QFileInfo>
 
 Core::Core(QString paramFilename, QString remoteHost, uint32_t remoteIdent, bool temp)
 {
@@ -14,8 +15,18 @@ Core::Core(QString paramFilename, QString remoteHost, uint32_t remoteIdent, bool
 
   memset(&m_APIProps, 0, sizeof(m_APIProps));
 
-  m_MainWindow = new MainWindow(this, paramFilename, remoteHost, remoteIdent, temp);
+  m_MainWindow = new MainWindow(this);
   m_MainWindow->show();
+
+  if(!paramFilename.isEmpty())
+  {
+      QFileInfo fi(paramFilename);
+
+      if(fi.suffix() == "rdc")
+      {
+          LoadLogfile(paramFilename, temp);
+      }
+  }
 }
 
 Core::~Core()
diff --git a/qrenderdoc/Windows/MainWindow.cpp b/qrenderdoc/Windows/MainWindow.cpp
index ee2e4f866..ee7a9a771 100644
--- a/qrenderdoc/Windows/MainWindow.cpp
+++ b/qrenderdoc/Windows/MainWindow.cpp
@@ -8,7 +8,7 @@
 
 #include "Code/Core.h"
 
-MainWindow::MainWindow(Core *core, QString paramFilename, QString remoteHost, uint32_t remoteIdent, bool temp) :
+MainWindow::MainWindow(Core *core) :
   QMainWindow(NULL),
   ui(new Ui::MainWindow),
   m_Core(core)
diff --git a/qrenderdoc/Windows/MainWindow.h b/qrenderdoc/Windows/MainWindow.h
index 32dc12505..38e79da97 100644
--- a/qrenderdoc/Windows/MainWindow.h
+++ b/qrenderdoc/Windows/MainWindow.h
@@ -15,7 +15,7 @@ class MainWindow : public QMainWindow
     Q_OBJECT
 
 public:
-    explicit MainWindow(Core *core, QString paramFilename, QString remoteHost, uint32_t remoteIdent, bool temp);
+    explicit MainWindow(Core *core);
     ~MainWindow();
 
 private slots: