diff --git a/mupen64plus-gui/interface/common.cpp b/mupen64plus-gui/interface/common.cpp
index f9576e2..2b3a1ae 100644
--- a/mupen64plus-gui/interface/common.cpp
+++ b/mupen64plus-gui/interface/common.cpp
@@ -325,6 +325,7 @@ m64p_error launchGame(QString netplay_ip, int netplay_port, int netplay_player)
                 reg_id = rand();
 #endif
             }
+            reg_id += netplay_player;
 
             if ((*CoreDoCommand)(M64CMD_NETPLAY_CONTROL_PLAYER, netplay_player, &reg_id) == M64ERR_SUCCESS)
                 DebugMessage(M64MSG_INFO, "Netplay: registered for player %d", netplay_player);
diff --git a/mupen64plus-gui/mainwindow.cpp b/mupen64plus-gui/mainwindow.cpp
index 30334f1..4c2d857 100644
--- a/mupen64plus-gui/mainwindow.cpp
+++ b/mupen64plus-gui/mainwindow.cpp
@@ -567,7 +567,7 @@ void MainWindow::createOGLWindow(QSurfaceFormat* format)
     if (my_window) my_window->deleteLater();
 
     my_window = new OGLWindow();
-    QWidget *container = QWidget::createWindowContainer(my_window);
+    QWidget *container = QWidget::createWindowContainer(my_window, this);
     container->setFocusPolicy(Qt::StrongFocus);
 
     my_window->setCursor(Qt::BlankCursor);