diff --git a/.flake8 b/.flake8
index bd33e493bfc..ecea7b82a0b 100644
--- a/.flake8
+++ b/.flake8
@@ -26,14 +26,12 @@ per-file-ignores =
     doc/gui/wxpython/example/dialogs.py: F401
     locale/grass_po_stats.py: E122, E128, E231, E401, E722
     gui/scripts/d.wms.py: E501
-    gui/wxpython/core/gcmd.py: E402
     gui/wxpython/core/gconsole.py: E722
+    gui/wxpython/core/render.py: E722
+    gui/wxpython/core/settings.py: E722
     gui/wxpython/core/toolboxes.py: E722
     gui/wxpython/core/utils.py: E722
     gui/wxpython/core/workspace.py: E722
-    gui/wxpython/core/render.py: E722
-    gui/wxpython/core/settings.py: E722
-    gui/wxpython/core/watchdog.py: E402
     gui/wxpython/datacatalog/tree.py: E731, E402
     gui/wxpython/dbmgr/base.py: E722
     gui/wxpython/dbmgr/dialogs.py: E722
diff --git a/gui/wxpython/core/gcmd.py b/gui/wxpython/core/gcmd.py
index 7d4ed678d79..b93789f22f7 100644
--- a/gui/wxpython/core/gcmd.py
+++ b/gui/wxpython/core/gcmd.py
@@ -36,6 +36,12 @@
 from threading import Thread
 import wx
 
+from core.debug import Debug
+from core.globalvar import SCT_EXT
+
+from grass.script import core as grass
+from grass.script.utils import decode, encode
+
 is_mswindows = sys.platform == "win32"
 if is_mswindows:
     from win32file import ReadFile, WriteFile
@@ -45,12 +51,6 @@
     import select
     import fcntl
 
-from core.debug import Debug
-from core.globalvar import SCT_EXT
-
-from grass.script import core as grass
-from grass.script.utils import decode, encode
-
 
 def DecodeString(string):
     """Decode string using system encoding
diff --git a/gui/wxpython/core/watchdog.py b/gui/wxpython/core/watchdog.py
index 9315a1010d6..652bc1d755d 100644
--- a/gui/wxpython/core/watchdog.py
+++ b/gui/wxpython/core/watchdog.py
@@ -19,6 +19,10 @@
 
 import os
 import time
+import wx
+from wx.lib.newevent import NewEvent
+
+from grass.script import core as grass
 
 watchdog_used = True
 try:
@@ -32,11 +36,6 @@
     PatternMatchingEventHandler = object
     FileSystemEventHandler = object
 
-import wx
-from wx.lib.newevent import NewEvent
-
-from grass.script import core as grass
-
 updateMapset, EVT_UPDATE_MAPSET = NewEvent()
 currentMapsetChanged, EVT_CURRENT_MAPSET_CHANGED = NewEvent()