diff --git a/src/AppFrame.cpp b/src/AppFrame.cpp
index 51c98d9..7129e92 100644
--- a/src/AppFrame.cpp
+++ b/src/AppFrame.cpp
@@ -369,22 +369,35 @@ void AppFrame::OnIdle(wxIdleEvent& event) {
             demodModeSelector->setSelection(dType);
         }
         if (demodWaterfallCanvas->getDragState() == WaterfallCanvas::WF_DRAG_NONE) {
-            if (demod->getFrequency() != demodWaterfallCanvas->getCenterFrequency()) {
-                demodWaterfallCanvas->setCenterFrequency(demod->getFrequency());
-                demodSpectrumCanvas->setCenterFrequency(demod->getFrequency());
-            }
-            int dSelection = demodModeSelector->getSelection();
-            if (dSelection != -1 && dSelection != demod->getDemodulatorType()) {
-                demod->setDemodulatorType(dSelection);
+            long long centerFreq = demod->getFrequency();
+            unsigned int demodBw = (unsigned int) ceil((float) demod->getBandwidth() * 2.5);
+
+            if (demod->getDemodulatorType() == DEMOD_TYPE_USB) {
+                demodBw /= 2;
+                centerFreq += demod->getBandwidth()/4;
+            }
+
+            if (demod->getDemodulatorType() == DEMOD_TYPE_LSB) {
+                demodBw /= 2;
+                centerFreq -= demod->getBandwidth()/4;
             }
 
-            unsigned int demodBw = (unsigned int) ceil((float) demod->getBandwidth() * 2.5);
             if (demodBw > wxGetApp().getSampleRate() / 2) {
                 demodBw = wxGetApp().getSampleRate() / 2;
             }
             if (demodBw < 30000) {
                 demodBw = 30000;
             }
+
+            if (centerFreq != demodWaterfallCanvas->getCenterFrequency()) {
+                demodWaterfallCanvas->setCenterFrequency(centerFreq);
+                demodSpectrumCanvas->setCenterFrequency(centerFreq);
+            }
+            int dSelection = demodModeSelector->getSelection();
+            if (dSelection != -1 && dSelection != demod->getDemodulatorType()) {
+                demod->setDemodulatorType(dSelection);
+            }
+
             demodWaterfallCanvas->setBandwidth(demodBw);
             demodSpectrumCanvas->setBandwidth(demodBw);
         }
diff --git a/src/demod/DemodulatorMgr.cpp b/src/demod/DemodulatorMgr.cpp
index d26a9e3..7604d92 100644
--- a/src/demod/DemodulatorMgr.cpp
+++ b/src/demod/DemodulatorMgr.cpp
@@ -77,7 +77,7 @@ std::vector<DemodulatorInstance *> *DemodulatorMgr::getDemodulatorsAt(long long
 
         long long halfBuffer = bandwidth / 2;
 
-        if ((freq <= (freqTest + halfBandwidthTest + halfBuffer)) && (freq >= (freqTest - halfBandwidthTest - halfBuffer))) {
+        if ((freq <= (freqTest + ((testDemod->getDemodulatorType() != DEMOD_TYPE_LSB)?halfBandwidthTest:0) + halfBuffer)) && (freq >= (freqTest - ((testDemod->getDemodulatorType() != DEMOD_TYPE_USB)?halfBandwidthTest:0) - halfBuffer))) {
             foundDemods->push_back(testDemod);
         }
     }
diff --git a/src/visual/PrimaryGLContext.cpp b/src/visual/PrimaryGLContext.cpp
index 7f9e59a..14e8604 100644
--- a/src/visual/PrimaryGLContext.cpp
+++ b/src/visual/PrimaryGLContext.cpp
@@ -125,7 +125,7 @@ void PrimaryGLContext::DrawDemodInfo(DemodulatorInstance *demod, float r, float
     glColor4f(r, g, b, 0.6);
 
     float ofs = ((float) demod->getBandwidth()) / (float) srate;
-
+    float ofsLeft = (demod->getDemodulatorType()!=DEMOD_TYPE_USB)?ofs:0, ofsRight = (demod->getDemodulatorType()!=DEMOD_TYPE_LSB)?ofs:0;
 
     float labelHeight = 20.0 / viewHeight;
     float hPos = -1.0 + labelHeight;
@@ -134,42 +134,47 @@ void PrimaryGLContext::DrawDemodInfo(DemodulatorInstance *demod, float r, float
 
     glColor4f(0, 0, 0, 0.35);
     glBegin(GL_QUADS);
-    glVertex3f(uxPos - ofs, hPos + labelHeight, 0.0);
-    glVertex3f(uxPos - ofs, -1.0, 0.0);
+    glVertex3f(uxPos - ofsLeft, hPos + labelHeight, 0.0);
+    glVertex3f(uxPos - ofsLeft, -1.0, 0.0);
 
-    glVertex3f(uxPos + ofs, -1.0, 0.0);
-    glVertex3f(uxPos + ofs, hPos + labelHeight, 0.0);
+    glVertex3f(uxPos + ofsRight, -1.0, 0.0);
+    glVertex3f(uxPos + ofsRight, hPos + labelHeight, 0.0);
     glEnd();
 
     glBlendFunc(GL_SRC_ALPHA, GL_ONE);
 
     glColor4f(r, g, b, 0.2);
     glBegin(GL_QUADS);
-    glVertex3f(uxPos - ofs, 1.0, 0.0);
-    glVertex3f(uxPos - ofs, -1.0, 0.0);
+    glVertex3f(uxPos - ofsLeft, 1.0, 0.0);
+    glVertex3f(uxPos - ofsLeft, -1.0, 0.0);
 
-    glVertex3f(uxPos + ofs, -1.0, 0.0);
-    glVertex3f(uxPos + ofs, 1.0, 0.0);
+    glVertex3f(uxPos + ofsRight, -1.0, 0.0);
+    glVertex3f(uxPos + ofsRight, 1.0, 0.0);
     glEnd();
 
-
-
     if (ofs * 2.0 < 16.0 / viewWidth) {
         ofs = 16.0 / viewWidth;
 
         glColor4f(r, g, b, 0.2);
         glBegin(GL_QUADS);
-        glVertex3f(uxPos - ofs, hPos + labelHeight, 0.0);
-        glVertex3f(uxPos - ofs, -1.0, 0.0);
+        glVertex3f(uxPos - ofsLeft, hPos + labelHeight, 0.0);
+        glVertex3f(uxPos - ofsLeft, -1.0, 0.0);
 
-        glVertex3f(uxPos + ofs, -1.0, 0.0);
-        glVertex3f(uxPos + ofs, hPos + labelHeight, 0.0);
+        glVertex3f(uxPos + ofsRight, -1.0, 0.0);
+        glVertex3f(uxPos + ofsRight, hPos + labelHeight, 0.0);
         glEnd();
     }
 
+
     glColor4f(1.0, 1.0, 1.0, 0.8);
 
-    getFont(PrimaryGLContext::GLFONT_SIZE16).drawString(demod->getLabel(), uxPos, hPos, 16, GLFont::GLFONT_ALIGN_CENTER, GLFont::GLFONT_ALIGN_CENTER);
+    if (demod->getDemodulatorType() == DEMOD_TYPE_USB) {
+        getFont(PrimaryGLContext::GLFONT_SIZE16).drawString(demod->getLabel(), uxPos, hPos, 16, GLFont::GLFONT_ALIGN_LEFT, GLFont::GLFONT_ALIGN_CENTER);
+    } else if (demod->getDemodulatorType() == DEMOD_TYPE_LSB) {
+        getFont(PrimaryGLContext::GLFONT_SIZE16).drawString(demod->getLabel(), uxPos, hPos, 16, GLFont::GLFONT_ALIGN_RIGHT, GLFont::GLFONT_ALIGN_CENTER);
+    } else {
+        getFont(PrimaryGLContext::GLFONT_SIZE16).drawString(demod->getLabel(), uxPos, hPos, 16, GLFont::GLFONT_ALIGN_CENTER, GLFont::GLFONT_ALIGN_CENTER);
+    }
 
     glDisable(GL_BLEND);
 
@@ -195,28 +200,29 @@ void PrimaryGLContext::DrawDemod(DemodulatorInstance *demod, float r, float g, f
     glBlendFunc(GL_SRC_ALPHA, GL_ONE);
     glColor4f(r, g, b, 0.6);
 
+    float ofs = ((float) demod->getBandwidth()) / (float) srate;
+    float ofsLeft = (demod->getDemodulatorType()!=DEMOD_TYPE_USB)?ofs:0, ofsRight = (demod->getDemodulatorType()!=DEMOD_TYPE_LSB)?ofs:0;
+
     glBegin(GL_LINES);
     glVertex3f((uxPos - 0.5) * 2.0, 1.0, 0.0);
     glVertex3f((uxPos - 0.5) * 2.0, -1.0, 0.0);
 
-    float ofs = ((float) demod->getBandwidth()) / (float) srate;
+    glVertex3f((uxPos - 0.5) * 2.0 - ofsLeft, 1.0, 0.0);
+    glVertex3f((uxPos - 0.5) * 2.0 - ofsLeft, -1.0, 0.0);
 
-    glVertex3f((uxPos - 0.5) * 2.0 - ofs, 1.0, 0.0);
-    glVertex3f((uxPos - 0.5) * 2.0 - ofs, -1.0, 0.0);
-
-    glVertex3f((uxPos - 0.5) * 2.0 + ofs, 1.0, 0.0);
-    glVertex3f((uxPos - 0.5) * 2.0 + ofs, -1.0, 0.0);
+    glVertex3f((uxPos - 0.5) * 2.0 + ofsRight, 1.0, 0.0);
+    glVertex3f((uxPos - 0.5) * 2.0 + ofsRight, -1.0, 0.0);
 
     glEnd();
 
     glBlendFunc(GL_SRC_ALPHA, GL_ONE);
     glColor4f(r, g, b, 0.2);
     glBegin(GL_QUADS);
-    glVertex3f((uxPos - 0.5) * 2.0 - ofs, 1.0, 0.0);
-    glVertex3f((uxPos - 0.5) * 2.0 - ofs, -1.0, 0.0);
+    glVertex3f((uxPos - 0.5) * 2.0 - ofsLeft, 1.0, 0.0);
+    glVertex3f((uxPos - 0.5) * 2.0 - ofsLeft, -1.0, 0.0);
 
-    glVertex3f((uxPos - 0.5) * 2.0 + ofs, -1.0, 0.0);
-    glVertex3f((uxPos - 0.5) * 2.0 + ofs, 1.0, 0.0);
+    glVertex3f((uxPos - 0.5) * 2.0 + ofsRight, -1.0, 0.0);
+    glVertex3f((uxPos - 0.5) * 2.0 + ofsRight, 1.0, 0.0);
     glEnd();
 
     GLint vp[4];
@@ -252,10 +258,12 @@ void PrimaryGLContext::DrawDemod(DemodulatorInstance *demod, float r, float g, f
     case DEMOD_TYPE_LSB:
         demodStr = "LSB";
         demodAlign = GLFont::GLFONT_ALIGN_RIGHT;
+        uxPos -= xOfs;
         break;
     case DEMOD_TYPE_USB:
         demodStr = "USB";
         demodAlign = GLFont::GLFONT_ALIGN_LEFT;
+        uxPos += xOfs;
         break;
     }