diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
index 8e6b20c..14a6c1e 100644
--- a/app/mainwindow.cpp
+++ b/app/mainwindow.cpp
@@ -353,7 +353,12 @@ void MainWindow::leaveEvent(QEvent *event)
 
 void MainWindow::mousePressEvent(QMouseEvent *event)
 {
-    if (event->buttons() & Qt::LeftButton && !isMaximized()) {
+    bool optionalMaximized = false;
+    #if defined(Q_OS_WIN)
+        optionalMaximized = isMaximized();
+    #endif
+
+    if (event->buttons() & Qt::LeftButton && !optionalMaximized && !isFullScreen()) {
         m_clickedOnWindow = true;
         m_oldMousePos = event->pos();
 //        qDebug() << m_oldMousePos << m_graphicsView->transform().m11()
@@ -366,7 +371,7 @@ void MainWindow::mousePressEvent(QMouseEvent *event)
 
 void MainWindow::mouseMoveEvent(QMouseEvent *event)
 {
-    if (event->buttons() & Qt::LeftButton && m_clickedOnWindow && !isMaximized() && !isFullScreen()) {
+    if (event->buttons() & Qt::LeftButton && m_clickedOnWindow) {
         if (!window()->windowHandle()->startSystemMove()) {
             move(event->globalPosition().toPoint() - m_oldMousePos);
         }
diff --git a/app/titlebar.cpp b/app/titlebar.cpp
index 6ada30e..c5f538d 100644
--- a/app/titlebar.cpp
+++ b/app/titlebar.cpp
@@ -129,8 +129,14 @@ void TitleBar::mouseMoveEvent(QMouseEvent *event)
         }
     }
 
+    bool optionalMaximized = false;
+    #if defined(Q_OS_WIN)
+        optionalMaximized = isMaximized();
+    #endif
+
     if (event->buttons() & Qt::LeftButton && m_dragPending
-        && !window()->isMaximized() && !window()->isFullScreen()) {
+        && !window()->isFullScreen() && !optionalMaximized) {
+        
         if (QWindow *wh = window()->windowHandle()) {
             if (!wh->startSystemMove())
                 window()->move(event->globalPosition().toPoint() - m_moveStartPos);